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/01/10 15:22:14 UTC

[isis] branch ISIS-2259 updated (f0f62d5 -> 868a69c)

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

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


    from f0f62d5  Merge remote-tracking branch 'origin/master' into ide
     new d3fdb9d  ISIS-2259: revert, renames isis-core-applib back to isis-applib
     new bfd3bf4  ISIS-2259: revert, renames isis-core-schema back to isis-schema
     new fde0cf3  ISIS-2259: moves isis-applib and isis-schema to ../api directory
     new 8b21f46  ISIS-2259: introduce parent for viewers/restfulobjects
     new f659d9b  ISIS-2259: introduce parent for viewers/wicket and persistence/jdo
     new c2e1e8d  ISIS-2259: moves security modules up a level, renames isis-security-api to isis-core-security
     new 2dbdf0c  ISIS-2259: moves core/persistence up a level.
     new 033d444  ISIS-2259: moves core/integtestsupport to testing/integtestsupport
     new aa0d039  ISIS-2259: renames isis-integtestsupport to isis-testing-integtestsupport-applib
     new bdef229  ISIS-2259: adds parent module for integtestsupport
     new ad03851  ISIS-2259: renames isis-unittestsupport to isis-core-unittestsupport
     new 98a59cc  ISIS-2259: moves core/testsupport/unittestsupport up one level
     new 2074ec1  ISIS-2259: moves core/viewers up a level.
     new 3ac9f0f  ISIS-2259: fixes package for isis-core-codegen-bytebuddy
     new c4b62b7  ISIS-2259: fixes package for isis-core-commons
     new 41d6458  ISIS-2259: fixes module class names for core-codegen-bytebuddy and core-commons
     new b6d4fa1  ISIS-2259: fixes package names for isis-core-config
     new 88b8e18  ISIS-2259: moves constants defined in ConfigurationConstants class elsewhere
     new 57d16ae  ISIS-2259: minor partial tidy up of detached-tests
     new 31b8b21  ISIS-2259: fixes up package name of isis-core-metamodel
     add ca65ac2  ISIS-2158: fixes to allow deployment of Isis on Payara5
     add ba33cc2  ISIS-2158: adding comments
     new 868a69c  Merge remote-tracking branch 'origin/master' into ide

The 21 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:
 antora/playbooks/site-refguide.yml                 |   10 +-
 antora/playbooks/site-testing.yml                  |    6 +-
 antora/playbooks/site.yml                          |   28 +-
 .../jaxrs-resteasy-4 => api/applib}/.gitignore     |    0
 api/applib/pom.xml                                 |  109 ++
 .../schema => api/applib}/src/main/doc/antora.yml  |    0
 .../src/main/doc/modules/applib-ant/examples.sh    |    0
 .../applib-ant/examples}/annotation/Action.java    |    0
 .../examples}/annotation/ActionLayout.java         |    0
 .../applib-ant/examples}/annotation/Auditing.java  |    0
 .../examples}/annotation/BookmarkPolicy.java       |    0
 .../applib-ant/examples}/annotation/Bounding.java  |    0
 .../examples}/annotation/Collection.java           |    0
 .../examples}/annotation/CollectionLayout.java     |    0
 .../examples}/annotation/CommandExecuteIn.java     |    0
 .../examples}/annotation/CommandPersistence.java   |    0
 .../examples}/annotation/CommandReification.java   |    0
 .../applib-ant/examples}/annotation/Constants.java |    0
 .../examples}/annotation/Contributed.java          |    0
 .../applib-ant/examples/annotation/Defaulted.java  |    0
 .../examples}/annotation/DomainObject.java         |    0
 .../examples}/annotation/DomainObjectLayout.java   |    0
 .../examples}/annotation/DomainService.java        |    0
 .../examples}/annotation/DomainServiceLayout.java  |    0
 .../applib-ant/examples}/annotation/Editing.java   |    0
 .../examples}/annotation/EqualByContent.java       |    0
 .../applib-ant/examples}/annotation/Facets.java    |    0
 .../applib-ant/examples}/annotation/HomePage.java  |    0
 .../examples}/annotation/LabelPosition.java        |    0
 .../examples}/annotation/MemberOrder.java          |    0
 .../examples}/annotation/MementoSerialization.java |    0
 .../applib-ant/examples}/annotation/MinLength.java |    0
 .../applib-ant/examples}/annotation/Mixin.java     |    0
 .../applib-ant/examples}/annotation/Module.java    |    0
 .../applib-ant/examples}/annotation/Nature.java    |    0
 .../examples}/annotation/NatureOfService.java      |    0
 .../applib-ant/examples}/annotation/Navigable.java |    0
 .../examples}/annotation/Optionality.java          |    0
 .../examples}/annotation/OrderPrecedence.java      |    0
 .../applib-ant/examples}/annotation/Parameter.java |    0
 .../examples}/annotation/ParameterLayout.java      |    0
 .../examples}/annotation/Programmatic.java         |    0
 .../examples}/annotation/Projecting.java           |    0
 .../examples}/annotation/PromptStyle.java          |    0
 .../applib-ant/examples}/annotation/Property.java  |    0
 .../examples}/annotation/PropertyLayout.java       |    0
 .../examples}/annotation/Publishing.java           |    0
 .../examples}/annotation/PublishingChangeKind.java |    0
 .../applib-ant/examples}/annotation/Redirect.java  |    0
 .../applib-ant/examples}/annotation/RenderDay.java |    0
 .../examples}/annotation/Repainting.java           |    0
 .../examples}/annotation/RestrictTo.java           |    0
 .../examples}/annotation/SemanticsOf.java          |    0
 .../applib-ant/examples}/annotation/Title.java     |    0
 .../applib-ant/examples/annotation/Value.java      |    0
 .../applib-ant/examples}/annotation/ViewModel.java |    0
 .../examples}/annotation/ViewModelLayout.java      |    0
 .../applib-ant/examples}/annotation/Where.java     |    0
 .../examples}/annotation/package-info.java         |    0
 .../main/doc/modules/applib-ant}/images/.gitkeep   |    0
 .../ActionLayout}/bookmarking.png                  |  Bin
 .../ActionLayout/position-BELOW.png                |  Bin
 .../ActionLayout/position-PANEL.png                |  Bin
 .../ActionLayout/position-PANEL_DROPDOWN.png       |  Bin
 .../ActionLayout/position-RIGHT.png                |  Bin
 .../CollectionLayout/sortedby-dependencies.png     |  Bin
 .../DomainObjectLayout/bookmarking-nested.png      |  Bin
 .../DomainObjectLayout}/bookmarking.png            |  Bin
 .../DomainServiceLayout/menuBar-primary.png        |  Bin
 .../DomainServiceLayout/menuBar-secondary.png      |  Bin
 .../DomainServiceLayout/menuBar-tertiary.png       |  Bin
 .../DomainServiceLayout/menuOrder.png              |  Bin
 .../reference-annotations/HomePage/HomePage.png    |  Bin
 .../PropertyLayout/labelPosition-LEFT.png          |  Bin
 .../PropertyLayout/labelPosition-NONE.png          |  Bin
 .../PropertyLayout/labelPosition-TOP.png           |  Bin
 .../PropertyLayout/labelPosition-boolean-LEFT.png  |  Bin
 .../PropertyLayout/labelPosition-boolean-RIGHT.png |  Bin
 .../src/main/doc/modules/applib-ant}/nav.adoc      |    0
 .../main/doc/modules/applib-ant/pages/Action.adoc  |    0
 .../applib-ant/pages/Action/associateWith.adoc     |    0
 .../modules/applib-ant/pages/Action/command.adoc   |    0
 .../applib-ant/pages/Action/domainEvent.adoc       |    0
 .../modules/applib-ant/pages/Action/hidden.adoc    |    0
 .../modules/applib-ant/pages/Action/invokeOn.adoc  |    0
 .../applib-ant/pages/Action/publishing.adoc        |    0
 .../applib-ant/pages/Action/restrictTo.adoc        |    0
 .../modules/applib-ant/pages/Action/semantics.adoc |    0
 .../modules/applib-ant/pages/Action/typeOf.adoc    |    0
 .../doc/modules/applib-ant/pages/ActionLayout.adoc |    0
 .../applib-ant/pages/ActionLayout/bookmarking.adoc |    0
 .../pages/ActionLayout/contributedAs.adoc          |    0
 .../applib-ant/pages/ActionLayout/cssClass.adoc    |    0
 .../applib-ant/pages/ActionLayout/cssClassFa.adoc  |    0
 .../applib-ant/pages/ActionLayout/describedAs.adoc |    0
 .../applib-ant/pages/ActionLayout/hidden.adoc      |    0
 .../applib-ant/pages/ActionLayout/named.adoc       |    0
 .../applib-ant/pages/ActionLayout/position.adoc    |    0
 .../applib-ant/pages/ActionLayout/promptStyle.adoc |    0
 .../applib-ant/pages/ActionLayout/redirect.adoc    |    0
 .../doc/modules/applib-ant/pages/Collection.adoc   |    0
 .../applib-ant/pages/Collection/domainEvent.adoc   |    0
 .../applib-ant/pages/Collection/editing.adoc       |    0
 .../applib-ant/pages/Collection/hidden.adoc        |    0
 .../applib-ant/pages/Collection/notPersisted.adoc  |    0
 .../applib-ant/pages/Collection/typeOf.adoc        |    0
 .../modules/applib-ant/pages/CollectionLayout.adoc |    0
 .../pages/CollectionLayout/cssClass.adoc           |    0
 .../pages/CollectionLayout/defaultView.adoc        |    0
 .../pages/CollectionLayout/describedAs.adoc        |    0
 .../applib-ant/pages/CollectionLayout/hidden.adoc  |    0
 .../applib-ant/pages/CollectionLayout/named.adoc   |    0
 .../applib-ant/pages/CollectionLayout/paged.adoc   |    0
 .../pages/CollectionLayout/sortedBy.adoc           |    0
 .../main/doc/modules/applib-ant/pages/Column.adoc  |    0
 .../main/doc/modules/applib-ant/pages/Digits.adoc  |    0
 .../modules/applib-ant/pages/Discriminator.adoc    |    0
 .../doc/modules/applib-ant/pages/DomainObject.adoc |    0
 .../pages/DomainObject/actionDomainEvent.adoc      |    0
 .../applib-ant/pages/DomainObject/auditing.adoc    |    0
 .../pages/DomainObject/autoCompleteRepository.adoc |    0
 .../applib-ant/pages/DomainObject/bounding.adoc    |    0
 .../pages/DomainObject/collectionDomainEvent.adoc  |    0
 .../pages/DomainObject/createdLifecycleEvent.adoc  |    0
 .../applib-ant/pages/DomainObject/editing.adoc     |    0
 .../pages/DomainObject/loadedLifecycleEvent.adoc   |    0
 .../applib-ant/pages/DomainObject/mixinMethod.adoc |    0
 .../applib-ant/pages/DomainObject/nature.adoc      |    0
 .../applib-ant/pages/DomainObject/objectType.adoc  |    0
 .../DomainObject/persistedLifecycleEvent.adoc      |    0
 .../DomainObject/persistingLifecycleEvent.adoc     |    0
 .../pages/DomainObject/propertyDomainEvent.adoc    |    0
 .../applib-ant/pages/DomainObject/publishing.adoc  |    0
 .../pages/DomainObject/removingLifecycleEvent.adoc |    0
 .../pages/DomainObject/updatedLifecycleEvent.adoc  |    0
 .../pages/DomainObject/updatingLifecycleEvent.adoc |    0
 .../applib-ant/pages/DomainObjectLayout.adoc       |    0
 .../pages/DomainObjectLayout/bookmarking.adoc      |    0
 .../pages/DomainObjectLayout/cssClass.adoc         |    0
 .../pages/DomainObjectLayout/cssClassFa.adoc       |    0
 .../pages/DomainObjectLayout/cssClassUiEvent.adoc  |    0
 .../pages/DomainObjectLayout/describedAs.adoc      |    0
 .../pages/DomainObjectLayout/iconUiEvent.adoc      |    0
 .../pages/DomainObjectLayout/layoutUiEvent.adoc    |    0
 .../applib-ant/pages/DomainObjectLayout/named.adoc |    0
 .../applib-ant/pages/DomainObjectLayout/paged.adoc |    0
 .../pages/DomainObjectLayout/plural.adoc           |    0
 .../pages/DomainObjectLayout/titleUiEvent.adoc     |    0
 .../modules/applib-ant/pages/DomainService.adoc    |    0
 .../applib-ant/pages/DomainService/nature.adoc     |    0
 .../applib-ant/pages/DomainService/objectType.adoc |    0
 .../pages/DomainService/repositoryFor.adoc         |    0
 .../applib-ant/pages/DomainServiceLayout.adoc      |    0
 .../pages/DomainServiceLayout/menuBar.adoc         |    0
 .../pages/DomainServiceLayout/menuOrder.adoc       |    0
 .../pages/DomainServiceLayout/named.adoc           |    0
 .../main/doc/modules/applib-ant/pages/Facets.adoc  |    0
 .../doc/modules/applib-ant/pages/HomePage.adoc     |    0
 .../main/doc/modules/applib-ant/pages/Inject.adoc  |    0
 .../applib-ant/pages/MemberGroupLayout.adoc        |    0
 .../doc/modules/applib-ant/pages/MemberOrder.adoc  |    0
 .../modules/applib-ant/pages/MemberOrder/name.adoc |    0
 .../applib-ant/pages/MemberOrder/sequence.adoc     |    0
 .../doc/modules/applib-ant/pages/MinLength.adoc    |    0
 .../main/doc/modules/applib-ant/pages/Mixin.adoc   |    0
 .../doc/modules/applib-ant/pages/Mixin/method.adoc |    0
 .../modules/applib-ant/pages/NotPersistent.adoc    |    0
 .../doc/modules/applib-ant/pages/Nullable.adoc     |    0
 .../doc/modules/applib-ant/pages/Parameter.adoc    |    0
 .../applib-ant/pages/Parameter/fileAccept.adoc     |    0
 .../applib-ant/pages/Parameter/maxLength.adoc      |    0
 .../applib-ant/pages/Parameter/mustSatisfy.adoc    |    0
 .../applib-ant/pages/Parameter/optionality.adoc    |    0
 .../applib-ant/pages/Parameter/regexPattern.adoc   |    0
 .../modules/applib-ant/pages/ParameterLayout.adoc  |    0
 .../applib-ant/pages/ParameterLayout/cssClass.adoc |    0
 .../pages/ParameterLayout/describedAs.adoc         |    0
 .../pages/ParameterLayout/labelPosition.adoc       |    0
 .../pages/ParameterLayout/multiLine.adoc           |    0
 .../applib-ant/pages/ParameterLayout/named.adoc    |    0
 .../pages/ParameterLayout/renderedAsDayBefore.adoc |    0
 .../pages/ParameterLayout/typicalLength.adoc       |    0
 .../main/doc/modules/applib-ant/pages/Pattern.adoc |    0
 .../applib-ant/pages/PersistenceCapable.adoc       |    0
 .../modules/applib-ant/pages/PostConstruct.adoc    |    0
 .../doc/modules/applib-ant/pages/PreDestroy.adoc   |    0
 .../doc/modules/applib-ant/pages/PrimaryKey.adoc   |    0
 .../doc/modules/applib-ant/pages/Programmatic.adoc |    0
 .../doc/modules/applib-ant/pages/Property.adoc     |    0
 .../modules/applib-ant/pages/Property/command.adoc |    0
 .../applib-ant/pages/Property/domainEvent.adoc     |    0
 .../modules/applib-ant/pages/Property/editing.adoc |    0
 .../applib-ant/pages/Property/fileAccept.adoc      |    0
 .../modules/applib-ant/pages/Property/hidden.adoc  |    0
 .../applib-ant/pages/Property/maxLength.adoc       |    0
 .../applib-ant/pages/Property/mustSatisfy.adoc     |    0
 .../applib-ant/pages/Property/notPersisted.adoc    |    0
 .../applib-ant/pages/Property/optionality.adoc     |    0
 .../applib-ant/pages/Property/projecting.adoc      |    0
 .../applib-ant/pages/Property/publishing.adoc      |    0
 .../applib-ant/pages/Property/regexPattern.adoc    |    0
 .../modules/applib-ant/pages/PropertyLayout.adoc   |    0
 .../applib-ant/pages/PropertyLayout/cssClass.adoc  |    0
 .../pages/PropertyLayout/describedAs.adoc          |    0
 .../applib-ant/pages/PropertyLayout/hidden.adoc    |    0
 .../pages/PropertyLayout/labelPosition.adoc        |    0
 .../applib-ant/pages/PropertyLayout/multiLine.adoc |    0
 .../applib-ant/pages/PropertyLayout/named.adoc     |    0
 .../applib-ant/pages/PropertyLayout/navigable.adoc |    0
 .../pages/PropertyLayout/promptStyle.adoc          |    0
 .../pages/PropertyLayout/renderedAsDayBefore.adoc  |    0
 .../pages/PropertyLayout/typicalLength.adoc        |    0
 .../pages/PropertyLayout/unchanging.adoc           |    0
 .../modules/applib-ant/pages/RequestScoped.adoc    |    0
 .../main/doc/modules/applib-ant/pages/Title.adoc   |    0
 .../doc/modules/applib-ant/pages/ViewModel.adoc    |    0
 .../applib-ant/pages/ViewModel/objectType.adoc     |    0
 .../modules/applib-ant/pages/ViewModelLayout.adoc  |    0
 .../pages/ViewModelLayout/bookmarking.adoc         |    0
 .../applib-ant/pages/ViewModelLayout/cssClass.adoc |    0
 .../pages/ViewModelLayout/cssClassFa.adoc          |    0
 .../pages/ViewModelLayout/cssClassUiEvent.adoc     |    0
 .../pages/ViewModelLayout/describedAs.adoc         |    0
 .../pages/ViewModelLayout/iconUiEvent.adoc         |    0
 .../pages/ViewModelLayout/layoutUiEvent.adoc       |    0
 .../applib-ant/pages/ViewModelLayout/named.adoc    |    0
 .../applib-ant/pages/ViewModelLayout/paged.adoc    |    0
 .../applib-ant/pages/ViewModelLayout/plural.adoc   |    0
 .../pages/ViewModelLayout/titleUiEvent.adoc        |    0
 .../applib-ant/pages/XmlJavaTypeAdapter.adoc       |    0
 .../modules/applib-ant/pages/XmlRootElement.adoc   |    0
 .../main/doc/modules/applib-ant/pages/about.adoc   |    0
 .../doc/modules/applib-ant/pages/about/jdo.adoc    |    0
 .../doc/modules/applib-ant/pages/about/jee.adoc    |    0
 .../doc/modules/applib-ant/pages/about/main.adoc   |    0
 .../doc/modules/applib-ant/pages/about/other.adoc  |    0
 .../modules/applib-ant/pages/about/partial.adoc    |    0
 .../modules/applib-ant/partials/module-nav.adoc    |    0
 .../src/main/doc/modules/applib-cm/examples.sh     |    0
 .../modules/applib-cm/examples}/clock/Clock.java   |    0
 .../applib-cm/examples}/clock/package-info.java    |    0
 .../examples/domain/DomainObjectList.java          |    0
 .../events/ActionArgumentUsabilityEvent.java       |    0
 .../events/ActionArgumentVisibilityEvent.java      |    0
 .../events/domain/AbstractDomainEvent.java         |    0
 .../examples}/events/domain/ActionDomainEvent.java |    0
 .../events/domain/CollectionDomainEvent.java       |    0
 .../examples}/events/domain/EventObjectBase.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
 .../applib-cm/examples}/events/ui/IconUiEvent.java |    0
 .../examples}/events/ui/LayoutUiEvent.java         |    0
 .../examples}/events/ui/TitleUiEvent.java          |    0
 .../layout/component/ActionLayoutData.java         |    0
 .../layout/component/ActionLayoutDataOwner.java    |    0
 .../layout/component/CollectionLayoutData.java     |    0
 .../component/CollectionLayoutDataOwner.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-cm/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
 .../applib-cm/examples}/layout/links/Link.java     |    0
 .../examples}/layout/links/package-info.java       |    0
 .../applib-cm/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
 .../applib-cm/examples}/layout/package-info.java   |    0
 .../applib-cm/examples}/mixins/MixinConstants.java |    0
 .../applib-cm/examples}/mixins/dto/Dto.java        |    0
 .../examples}/mixins/dto/DtoMappingHelper.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
 .../applib-cm/examples}/security/RoleMemento.java  |    0
 .../applib-cm/examples}/security/UserMemento.java  |    0
 .../applib-cm/examples}/security/package-info.java |    0
 .../examples}/spec/AbstractSpecification.java      |    0
 .../examples}/spec/AbstractSpecification2.java     |    0
 .../applib-cm/examples}/spec/Specification.java    |    0
 .../applib-cm/examples}/spec/Specification2.java   |    0
 .../applib-cm/examples}/spec/SpecificationAnd.java |    0
 .../applib-cm/examples}/spec/SpecificationNot.java |    0
 .../applib-cm/examples}/spec/SpecificationOr.java  |    0
 .../applib-cm/examples}/spec/package-info.java     |    0
 .../applib-cm/examples}/tree/LazyTreeNode.java     |    0
 .../applib-cm/examples}/tree/TreeAdapter.java      |    0
 .../modules/applib-cm/examples}/tree/TreeNode.java |    0
 .../tree/TreeNode_iteratorBreadthFirst.java        |    0
 .../tree/TreeNode_iteratorDepthFirst.java          |    0
 .../tree/TreeNode_iteratorHierarchyUp.java         |    0
 .../modules/applib-cm/examples}/tree/TreePath.java |    0
 .../applib-cm/examples}/tree/TreePath_Default.java |    0
 .../applib-cm/examples}/tree/TreeState.java        |    0
 .../examples}/tree/TreeState_Default.java          |    0
 .../modules/applib-cm/examples}/util/Enums.java    |    0
 .../modules/applib-cm/examples}/util/Equality.java |    0
 .../modules/applib-cm/examples}/util/Hashing.java  |    0
 .../applib-cm/examples}/util/JaxbAdapters.java     |    0
 .../modules/applib-cm/examples}/util/JaxbUtil.java |    0
 .../examples}/util/ObjectContract_Empty.java       |    0
 .../examples}/util/ObjectContract_Impl.java        |    0
 .../examples}/util/ObjectContract_Parser.java      |    0
 .../applib-cm/examples}/util/ObjectContracts.java  |    0
 .../applib-cm/examples}/util/ReasonBuffer.java     |    0
 .../applib-cm/examples}/util/ReasonBuffer2.java    |    0
 .../modules/applib-cm/examples}/util/Reasons.java  |    0
 .../applib-cm/examples}/util/TitleBuffer.java      |    0
 .../examples}/util/TitleBufferException.java       |    0
 .../modules/applib-cm/examples}/util/ToString.java |    0
 .../applib-cm/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
 .../modules/applib-cm/examples}/value/Blob.java    |    0
 .../applib-cm/examples}/value/BlobClobFactory.java |    0
 .../modules/applib-cm/examples}/value/Clob.java    |    0
 .../modules/applib-cm/examples}/value/Image.java   |    0
 .../examples}/value/LocalResourcePath.java         |    0
 .../modules/applib-cm/examples}/value/Markup.java  |    0
 .../examples}/value/NamedWithMimeType.java         |    0
 .../applib-cm/examples}/value/Password.java        |    0
 .../applib-cm/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-cm}/images/value-types/markup.png       |  Bin
 .../src/main/doc/modules/applib-cm}/nav.adoc       |    0
 .../main/doc/modules/applib-cm/pages/about.adoc    |    0
 .../main/doc/modules/applib-cm/pages/classes.adoc  |    0
 .../pages/classes/AppManifest-bootstrapping.adoc   |    0
 .../pages/classes/AppManifest2-bootstrapping.adoc  |    0
 .../applib-cm/pages/classes/contributee.adoc       |    0
 .../classes/contributee/HasTransactionId.adoc      |    0
 .../pages/classes/contributee/HasUserName.adoc     |    0
 .../applib-cm/pages/classes/domainevent.adoc       |    0
 .../classes/domainevent/AbstractDomainEvent.adoc   |    0
 .../classes/domainevent/ActionDomainEvent.adoc     |    0
 .../classes/domainevent/CollectionDomainEvent.adoc |    0
 .../classes/domainevent/PropertyDomainEvent.adoc   |    0
 .../doc/modules/applib-cm/pages/classes/i18n.adoc  |    0
 .../pages/classes/i18n/TranslatableString.adoc     |    0
 .../modules/applib-cm/pages/classes/layout.adoc    |    0
 .../applib-cm/pages/classes/lifecycleevent.adoc    |    0
 .../lifecycleevent/AbstractLifecycleEvent.adoc     |    0
 .../classes/lifecycleevent/ObjectCreatedEvent.adoc |    0
 .../classes/lifecycleevent/ObjectLoadedEvent.adoc  |    0
 .../lifecycleevent/ObjectPersistedEvent.adoc       |    0
 .../lifecycleevent/ObjectPersistingEvent.adoc      |    0
 .../lifecycleevent/ObjectRemovingEvent.adoc        |    0
 .../classes/lifecycleevent/ObjectUpdatedEvent.adoc |    0
 .../lifecycleevent/ObjectUpdatingEvent.adoc        |    0
 .../modules/applib-cm/pages/classes/menubars.adoc  |    0
 .../modules/applib-cm/pages/classes/mixins.adoc    |    0
 .../applib-cm/pages/classes/mixins/Dto.adoc        |    0
 .../applib-cm/pages/classes/mixins/Object.adoc     |    0
 .../pages/classes/mixins/Persistable.adoc          |    0
 .../doc/modules/applib-cm/pages/classes/roles.adoc |    0
 .../pages/classes/roles/HoldsUpdatedAt.adoc        |    0
 .../pages/classes/roles/HoldsUpdatedBy.adoc        |    0
 .../pages/classes/roles/Timestampable.adoc         |    0
 .../doc/modules/applib-cm/pages/classes/spec.adoc  |    0
 .../doc/modules/applib-cm/pages/classes/super.adoc |    0
 .../pages/classes/super/AbstractService.adoc       |    0
 .../pages/classes/super/AbstractSubscriber.adoc    |    0
 .../pages/classes/super/AbstractViewModel.adoc     |    0
 .../pages/classes/super/FixtureScript.adoc         |    0
 .../pages/classes/super/FixtureScripts.adoc        |    0
 .../modules/applib-cm/pages/classes/uievent.adoc   |    0
 .../pages/classes/uievent/CssClassUiEvent.adoc     |    0
 .../pages/classes/uievent/IconUiEvent.adoc         |    0
 .../pages/classes/uievent/TitleUiEvent.adoc        |    0
 .../modules/applib-cm/pages/classes/utility.adoc   |    0
 .../applib-cm/pages/classes/utility/Enums.adoc     |    0
 .../pages/classes/utility/ObjectContracts.adoc     |    0
 .../applib-cm/pages/classes/utility/Reasons.adoc   |    0
 .../pages/classes/utility/TitleBuffer.adoc         |    0
 .../applib-cm/pages/classes/value-types.adoc       |    0
 .../applib-cm/pages/classes/value-types/Blob.adoc  |    0
 .../applib-cm/pages/classes/value-types/Clob.adoc  |    0
 .../applib-cm/pages/classes/value-types/Color.adoc |    0
 .../pages/classes/value-types/Markup.adoc          |    0
 .../applib-cm/pages/classes/value-types/Money.adoc |    0
 .../pages/classes/value-types/Password.adoc        |    0
 .../main/doc/modules/applib-cm/pages/methods.adoc  |    0
 .../modules/applib-cm/pages/methods/lifecycle.adoc |    0
 .../applib-cm/pages/methods/lifecycle/created.adoc |    0
 .../applib-cm/pages/methods/lifecycle/jdo-api.adoc |    0
 .../applib-cm/pages/methods/lifecycle/loaded.adoc  |    0
 .../pages/methods/lifecycle/persisted.adoc         |    0
 .../pages/methods/lifecycle/persisting.adoc        |    0
 .../applib-cm/pages/methods/lifecycle/removed.adoc |    0
 .../pages/methods/lifecycle/removing.adoc          |    0
 .../applib-cm/pages/methods/lifecycle/updated.adoc |    0
 .../pages/methods/lifecycle/updating.adoc          |    0
 .../modules/applib-cm/pages/methods/prefixes.adoc  |    0
 .../applib-cm/pages/methods/prefixes/addTo.adoc    |    0
 .../pages/methods/prefixes/autoComplete.adoc       |    0
 .../applib-cm/pages/methods/prefixes/choices.adoc  |    0
 .../applib-cm/pages/methods/prefixes/clear.adoc    |    0
 .../applib-cm/pages/methods/prefixes/default.adoc  |    0
 .../applib-cm/pages/methods/prefixes/disable.adoc  |    0
 .../applib-cm/pages/methods/prefixes/get.adoc      |    0
 .../applib-cm/pages/methods/prefixes/hide.adoc     |    0
 .../applib-cm/pages/methods/prefixes/modify.adoc   |    0
 .../pages/methods/prefixes/removeFrom.adoc         |    0
 .../applib-cm/pages/methods/prefixes/set.adoc      |    0
 .../applib-cm/pages/methods/prefixes/validate.adoc |    0
 .../pages/methods/prefixes/validateAddTo.adoc      |    0
 .../pages/methods/prefixes/validateRemoveFrom.adoc |    0
 .../modules/applib-cm/pages/methods/reserved.adoc  |    0
 .../applib-cm/pages/methods/reserved/cssClass.adoc |    0
 .../applib-cm/pages/methods/reserved/disable.adoc  |    0
 .../applib-cm/pages/methods/reserved/getId.adoc    |    0
 .../applib-cm/pages/methods/reserved/hide.adoc     |    0
 .../applib-cm/pages/methods/reserved/iconName.adoc |    0
 .../applib-cm/pages/methods/reserved/layout.adoc   |    0
 .../applib-cm/pages/methods/reserved/title.adoc    |    0
 .../applib-cm/pages/methods/reserved/validate.adoc |    0
 .../main/doc/modules/applib-cm/pages/rgcms.adoc    |    0
 .../doc/modules/applib-cm/partials/module-nav.adoc |    0
 .../src/main/doc/modules/applib-svc/examples.sh    |    0
 .../applib-svc/examples}/services/HasUniqueId.java |    0
 .../applib-svc/examples}/services/HasUsername.java |    0
 .../RepresentsInteractionMemberExecution.java      |    0
 .../examples}/services/WithTransactionScope.java   |    0
 .../services/acceptheader/AcceptHeaderService.java |    0
 .../appfeat/ApplicationFeatureRepository.java      |    0
 .../services/appfeat/ApplicationMemberType.java    |    0
 .../examples}/services/appfeat/package-info.java   |    0
 .../services/audit/AuditEntryPropertyIdType.java   |    0
 .../audit/AuditEntryPropertyValueType.java         |    0
 .../examples}/services/audit/AuditerService.java   |    0
 .../services/audit/AuditerServiceLogging.java      |    0
 .../examples}/services/audit/package-info.java     |    0
 .../background/BackgroundCommandService.java       |    0
 .../services/background/package-info.java          |    0
 .../examples}/services/bookmark/Bookmark.java      |    0
 .../services/bookmark/BookmarkHolder.java          |    0
 .../services/bookmark/BookmarkHolder_lookup.java   |    0
 .../services/bookmark/BookmarkHolder_object.java   |    0
 .../services/bookmark/BookmarkService.java         |    0
 .../examples}/services/bookmark/package-info.java  |    0
 .../services/bookmarkui/BookmarkUiService.java     |    0
 .../examples}/services/clock/ClockService.java     |    0
 .../examples}/services/clock/package-info.java     |    0
 .../examples}/services/command/Command.java        |    0
 .../examples}/services/command/CommandContext.java |    0
 .../examples}/services/command/CommandDefault.java |    0
 .../services/command/CommandDtoProcessor.java      |    0
 .../CommandDtoProcessorForActionAbstract.java      |    0
 .../CommandDtoProcessorForPropertyAbstract.java    |    0
 .../services/command/CommandExecutorService.java   |    0
 .../examples}/services/command/CommandWithDto.java |    0
 .../examples}/services/command/package-info.java   |    0
 .../services/command/spi/CommandService.java       |    0
 .../services/confview/ConfigurationMenu.java       |    0
 .../services/confview/ConfigurationProperty.java   |    0
 .../confview/ConfigurationProperty.layout.xml      |    0
 .../services/confview/ConfigurationProperty.png    |  Bin
 .../confview/ConfigurationViewService.java         |    0
 .../examples}/services/confview/package-info.java  |    0
 .../services/conmap/ContentMappingService.java     |    0
 .../ContentMappingServiceForCommandDto.java        |    0
 .../ContentMappingServiceForCommandsDto.java       |    0
 .../command/spi/CommandDtoProcessorService.java    |    0
 .../examples}/services/conmap/package-info.java    |    0
 .../examples}/services/email/EmailService.java     |    0
 .../examples}/services/email/package-info.java     |    0
 .../examples}/services/error/ErrorDetails.java     |    0
 .../services/error/ErrorReportingService.java      |    0
 .../examples}/services/error/Ticket.java           |    0
 .../examples}/services/error/package-info.java     |    0
 .../services/eventbus/EventBusService.java         |    0
 .../examples}/services/eventbus/package-info.java  |    0
 .../services/exceprecog/ExceptionRecognizer.java   |    0
 .../exceprecog/ExceptionRecognizerAbstract.java    |    0
 .../exceprecog/ExceptionRecognizerComposite.java   |    0
 .../exceprecog/ExceptionRecognizerForType.java     |    0
 .../services/exceprecog/TranslatableException.java |    0
 .../services/exceprecog/package-info.java          |    0
 .../examples}/services/factory/FactoryService.java |    0
 .../examples}/services/factory/package-info.java   |    0
 .../examples}/services/grid/GridLoaderService.java |    0
 .../examples}/services/grid/GridService.java       |    0
 .../examples}/services/grid/GridSystemService.java |    0
 .../examples}/services/grid/package-info.java      |    0
 .../examples}/services/health/Health.java          |    0
 .../services/health/HealthCheckService.java        |    0
 .../examples}/services/hint/HintStore.java         |    0
 .../examples}/services/hint/package-info.java      |    0
 .../examples}/services/i18n/LocaleProvider.java    |    0
 .../services/i18n/TranslatableString.java          |    0
 .../services/i18n/TranslationService.java          |    0
 .../services/i18n/TranslationsResolver.java        |    0
 .../examples}/services/i18n/package-info.java      |    0
 .../examples}/services/iactn/Interaction.java      |    0
 .../services/iactn/InteractionContext.java         |    0
 .../examples}/services/iactn/package-info.java     |    0
 .../examples}/services/inject/ServiceInjector.java |    0
 .../jaxb/CatalogingSchemaOutputResolver.java       |    0
 .../examples}/services/jaxb/JaxbService.java       |    0
 .../services/jaxb/JaxbServiceDefault.java          |    0
 .../services/jaxb/StreamResultWithWriter.java      |    0
 .../examples}/services/jaxb/package-info.java      |    0
 .../examples}/services/layout/LayoutService.java   |    0
 .../services/layout/LayoutServiceMenu.java         |    0
 .../examples}/services/layout/package-info.java    |    0
 .../services/linking/DeepLinkService.java          |    0
 .../examples}/services/linking/package-info.java   |    0
 .../services/menu/MenuBarsLoaderService.java       |    0
 .../examples}/services/menu/MenuBarsService.java   |    0
 .../examples}/services/message/MessageService.java |    0
 .../examples}/services/message/package-info.java   |    0
 .../examples}/services/metamodel/DomainMember.java |    0
 .../examples}/services/metamodel/DomainModel.java  |    0
 .../services/metamodel/MetaModelService.java       |    0
 .../services/metamodel/MetaModelServicesMenu.java  |    0
 .../examples}/services/metamodel/package-info.java |    0
 .../examples}/services/metrics/MetricsService.java |    0
 .../examples}/services/metrics/package-info.java   |    0
 .../examples}/services/package-info.java           |    0
 .../services/publish/PublishedObjects.java         |    0
 .../services/publish/PublisherService.java         |    0
 .../services/publish/PublisherServiceLogging.java  |    0
 .../examples}/services/publish/package-info.java   |    0
 .../queryresultscache/QueryResultCacheControl.java |    0
 .../queryresultscache/QueryResultsCache.java       |    0
 .../QueryResultsCacheDefault.java                  |    0
 .../services/queryresultscache/package-info.java   |    0
 .../services/registry/ServiceRegistry.java         |    0
 .../examples}/services/registry/package-info.java  |    0
 .../services/repository/RepositoryService.java     |    0
 .../services/repository/package-info.java          |    0
 .../examples}/services/routing/RoutingService.java |    0
 .../examples}/services/routing/package-info.java   |    0
 .../examples}/services/scratchpad/Scratchpad.java  |    0
 .../services/scratchpad/package-info.java          |    0
 .../services/session/SessionLoggingService.java    |    0
 .../examples}/services/session/package-info.java   |    0
 .../sessmgmt/SessionManagementService.java         |    0
 .../examples}/services/sessmgmt/package-info.java  |    0
 .../examples}/services/sudo/SudoService.java       |    0
 .../examples}/services/sudo/package-info.java      |    0
 .../examples}/services/swagger/SwaggerService.java |    0
 .../examples}/services/swagger/package-info.java   |    0
 .../services/tablecol/TableColumnOrderService.java |    0
 .../examples}/services/title/TitleService.java     |    0
 .../examples}/services/title/package-info.java     |    0
 .../services/urlencoding/UrlEncodingService.java   |    0
 ...rlEncodingServiceUsingBaseEncodingAbstract.java |    0
 .../UrlEncodingServiceWithCompression.java         |    0
 .../services/urlencoding/package-info.java         |    0
 .../examples}/services/user/UserService.java       |    0
 .../examples}/services/user/package-info.java      |    0
 .../services/userprof/UserProfileService.java      |    0
 .../examples}/services/userprof/package-info.java  |    0
 .../services/userreg/EmailNotificationService.java |    0
 .../examples}/services/userreg/UserDetails.java    |    0
 .../services/userreg/UserRegistrationService.java  |    0
 .../userreg/events/EmailEventAbstract.java         |    0
 .../userreg/events/EmailRegistrationEvent.java     |    0
 .../userreg/events/PasswordResetEvent.java         |    0
 .../examples}/services/userreg/package-info.java   |    0
 .../examples}/services/wrapper/AsyncWrap.java      |    0
 .../services/wrapper/DisabledException.java        |    0
 .../services/wrapper/HiddenException.java          |    0
 .../services/wrapper/InteractionException.java     |    0
 .../services/wrapper/InvalidException.java         |    0
 .../examples}/services/wrapper/WrapperFactory.java |    0
 .../examples}/services/wrapper/WrappingObject.java |    0
 .../services/wrapper/events/AccessEvent.java       |    0
 .../wrapper/events/ActionArgumentEvent.java        |    0
 .../wrapper/events/ActionInvocationEvent.java      |    0
 .../wrapper/events/ActionUsabilityEvent.java       |    0
 .../wrapper/events/ActionVisibilityEvent.java      |    0
 .../wrapper/events/CollectionAccessEvent.java      |    0
 .../wrapper/events/CollectionAddToEvent.java       |    0
 .../wrapper/events/CollectionMethodEvent.java      |    0
 .../wrapper/events/CollectionRemoveFromEvent.java  |    0
 .../wrapper/events/CollectionUsabilityEvent.java   |    0
 .../wrapper/events/CollectionVisibilityEvent.java  |    0
 .../services/wrapper/events/InteractionEvent.java  |    0
 .../services/wrapper/events/ObjectTitleEvent.java  |    0
 .../wrapper/events/ObjectValidityEvent.java        |    0
 .../wrapper/events/ObjectVisibilityEvent.java      |    0
 .../services/wrapper/events/ParseValueEvent.java   |    0
 .../wrapper/events/PropertyAccessEvent.java        |    0
 .../wrapper/events/PropertyModifyEvent.java        |    0
 .../wrapper/events/PropertyUsabilityEvent.java     |    0
 .../wrapper/events/PropertyVisibilityEvent.java    |    0
 .../wrapper/events/ProposedHolderEvent.java        |    0
 .../services/wrapper/events/UsabilityEvent.java    |    0
 .../services/wrapper/events/ValidityEvent.java     |    0
 .../services/wrapper/events/VisibilityEvent.java   |    0
 .../services/wrapper/events/package-info.java      |    0
 .../wrapper/listeners/InteractionAdapter.java      |    0
 .../wrapper/listeners/InteractionListener.java     |    0
 .../examples}/services/wrapper/package-info.java   |    0
 .../examples}/services/xactn/Transaction.java      |    0
 .../examples}/services/xactn/TransactionId.java    |    0
 .../services/xactn/TransactionService.java         |    0
 .../examples}/services/xactn/TransactionState.java |    0
 .../examples}/services/xactn/package-info.java     |    0
 .../services/xmlsnapshot/XmlSnapshotService.java   |    0
 .../xmlsnapshot/XmlSnapshotServiceAbstract.java    |    0
 .../services/xmlsnapshot/package-info.java         |    0
 .../reference-services-api/acceptheaderservice.png |  Bin
 .../acceptheaderservice.pptx                       |  Bin
 .../ErrorReportingService/kitchensink-example.png  |  Bin
 .../action-invocation-published-to-stderr.png      |  Bin
 .../changed-object-published-to-stderr.png         |  Bin
 .../PublishingService/yuml.me-23db58a4.png         |  Bin
 .../UserProfileService/todoapp.png                 |  Bin
 .../images/reference-services/categories.png       |  Bin
 .../images/reference-services/categories.pptx      |  Bin
 .../reference-services/commands-and-events.png     |  Bin
 .../reference-services/commands-and-events.pptx    |  Bin
 .../src/main/doc/modules/applib-svc}/nav.adoc      |    0
 .../main/doc/modules/applib-svc/pages/about.adoc   |    0
 .../applib-svc/pages/application-layer-api.adoc    |    0
 .../application-layer-api/BackgroundService.adoc   |    0
 .../BackgroundCommandExecution.adoc                |    0
 .../BackgroundService/Quartz.adoc                  |    0
 .../application-layer-api/CommandContext.adoc      |    0
 .../CommandExecutorService.adoc                    |    0
 .../application-layer-api/DtoMappingHelper.adoc    |    0
 .../application-layer-api/InteractionContext.adoc  |    0
 .../application-layer-api/MessageService.adoc      |    0
 .../SessionManagementService.adoc                  |    0
 .../pages/application-layer-api/TitleService.adoc  |    0
 .../application-layer-api/TransactionService.adoc  |    0
 .../application-layer-api/WrapperFactory.adoc      |    0
 .../applib-svc/pages/application-layer-spi.adoc    |    0
 .../BackgroundCommandService.adoc                  |    0
 .../application-layer-spi/CommandService.adoc      |    0
 .../application-layer-spi/HealthCheckService.adoc  |    0
 .../HomePageProviderService.adoc                   |    0
 .../applib-svc/pages/bootstrapping-spi.adoc        |    0
 .../bootstrapping-spi/ClassDiscoveryService.adoc   |    0
 .../modules/applib-svc/pages/core-domain-api.adoc  |    0
 .../pages/core-domain-api/ClockService.adoc        |    0
 .../core-domain-api/ConfigurationService.adoc      |    0
 .../pages/core-domain-api/EventBusService.adoc     |    0
 .../pages/core-domain-api/FactoryService.adoc      |    0
 .../pages/core-domain-api/Scratchpad.adoc          |    0
 .../pages/core-domain-api/UserService.adoc         |    0
 .../modules/applib-svc/pages/integration-api.adoc  |    0
 .../pages/integration-api/BookmarkService.adoc     |    0
 .../pages/integration-api/EmailService.adoc        |    0
 .../pages/integration-api/JaxbService.adoc         |    0
 .../pages/integration-api/MementoService.adoc      |    0
 .../pages/integration-api/XmlSnapshotService.adoc  |    0
 .../doc/modules/applib-svc/pages/metadata-api.adoc |    0
 .../metadata-api/ApplicationFeatureRepository.adoc |    0
 .../pages/metadata-api/LayoutService.adoc          |    0
 .../pages/metadata-api/MetamodelService.adoc       |    0
 .../pages/metadata-api/ServiceRegistry.adoc        |    0
 .../pages/metadata-api/SwaggerService.adoc         |    0
 .../applib-svc/pages/persistence-layer-api.adoc    |    0
 .../pages/persistence-layer-api/H2ManagerMenu.adoc |    0
 .../persistence-layer-api/HsqlDbManagerMenu.adoc   |    0
 .../persistence-layer-api/IsisJdoSupport.adoc      |    0
 .../persistence-layer-api/MetricsService.adoc      |    0
 .../persistence-layer-api/QueryResultsCache.adoc   |    0
 .../persistence-layer-api/RepositoryService.adoc   |    0
 .../applib-svc/pages/persistence-layer-spi.adoc    |    0
 .../persistence-layer-spi/AuditerService.adoc      |    0
 .../persistence-layer-spi/PublisherService.adoc    |    0
 .../UserRegistrationService.adoc                   |    0
 .../applib-svc/pages/presentation-layer-api.adoc   |    0
 .../AcceptHeaderService.adoc                       |    0
 .../presentation-layer-api/BookmarkUiService.adoc  |    0
 .../ConfigurationViewService.adoc                  |    0
 .../presentation-layer-api/DeepLinkService.adoc    |    0
 .../presentation-layer-api/GuiceBeanProvider.adoc  |    0
 .../applib-svc/pages/presentation-layer-spi.adoc   |    0
 .../ContentMappingService.adoc                     |    0
 .../EmailNotificationService.adoc                  |    0
 .../ErrorReportingService.adoc                     |    0
 .../ExceptionRecognizer.adoc                       |    0
 .../presentation-layer-spi/GridLoaderService.adoc  |    0
 .../pages/presentation-layer-spi/GridService.adoc  |    0
 .../presentation-layer-spi/GridSystemService.adoc  |    0
 .../pages/presentation-layer-spi/HintStore.adoc    |    0
 .../presentation-layer-spi/LocaleProvider.adoc     |    0
 .../MenuBarsLoaderService.adoc                     |    0
 .../presentation-layer-spi/MenuBarsService.adoc    |    0
 .../presentation-layer-spi/RoutingService.adoc     |    0
 .../SessionLoggingService.adoc                     |    0
 .../TableColumnOrderService.adoc                   |    0
 .../presentation-layer-spi/TranslationService.adoc |    0
 .../TranslationsResolver.adoc                      |    0
 .../presentation-layer-spi/UrlEncodingService.adoc |    0
 .../presentation-layer-spi/UserProfileService.adoc |    0
 .../main/doc/modules/applib-svc/pages/testing.adoc |    0
 .../pages/testing/ExecutionParametersService.adoc  |    0
 .../applib-svc/pages/testing/FixtureScripts.adoc   |    0
 .../FixtureScriptsSpecificationProvider.adoc       |    0
 .../applib-svc/pages/testing/SudoService.adoc      |    0
 .../pages/testing/SwitchUserService.adoc           |    0
 .../modules/applib-svc/partials/module-nav.adoc    |    0
 .../org/apache/isis/applib/AbstractService.java    |    0
 .../org/apache/isis/applib/AbstractViewModel.java  |    0
 .../apache/isis/applib/ApplicationException.java   |    0
 .../org/apache/isis/applib/FatalException.java     |    0
 .../java/org/apache/isis/applib/Identifier.java    |  444 +++++
 .../org/apache/isis/applib/IsisModuleApplib.java   |    0
 .../isis/applib/NonRecoverableException.java       |  142 ++
 .../apache/isis/applib/PersistFailedException.java |    0
 .../apache/isis/applib/RecoverableException.java   |  136 ++
 .../isis/applib/RecreatableDomainObject.java       |    0
 .../apache/isis/applib/RepositoryException.java    |    0
 .../java/org/apache/isis/applib/ViewModel.java     |    0
 .../adapters/AbstractValueSemanticsProvider.java   |    0
 .../isis/applib/adapters/DefaultsProvider.java     |    0
 .../isis/applib/adapters/EncoderDecoder.java       |    0
 .../isis/applib/adapters/EncodingException.java    |    0
 .../org/apache/isis/applib/adapters/Parser.java    |    0
 .../isis/applib/adapters/ParsingException.java     |    0
 .../applib/adapters/ValueSemanticsProvider.java    |    0
 .../apache/isis/applib/adapters/package-info.java  |    0
 .../org/apache/isis/applib}/annotation/Action.java |    0
 .../isis/applib}/annotation/ActionLayout.java      |    0
 .../apache/isis/applib}/annotation/Auditing.java   |    0
 .../isis/applib}/annotation/BookmarkPolicy.java    |    0
 .../apache/isis/applib}/annotation/Bounding.java   |    0
 .../apache/isis/applib}/annotation/Collection.java |    0
 .../isis/applib}/annotation/CollectionLayout.java  |    0
 .../isis/applib}/annotation/CommandExecuteIn.java  |    0
 .../applib}/annotation/CommandPersistence.java     |    0
 .../applib}/annotation/CommandReification.java     |    0
 .../apache/isis/applib}/annotation/Constants.java  |    0
 .../isis/applib}/annotation/Contributed.java       |    0
 .../apache/isis/applib/annotation/Defaulted.java   |    0
 .../isis/applib}/annotation/DomainObject.java      |    0
 .../applib}/annotation/DomainObjectLayout.java     |    0
 .../isis/applib}/annotation/DomainService.java     |    0
 .../applib}/annotation/DomainServiceLayout.java    |    0
 .../apache/isis/applib}/annotation/Editing.java    |    0
 .../isis/applib}/annotation/EqualByContent.java    |    0
 .../org/apache/isis/applib}/annotation/Facets.java |    0
 .../apache/isis/applib}/annotation/HomePage.java   |    0
 .../isis/applib}/annotation/LabelPosition.java     |    0
 .../isis/applib}/annotation/MemberOrder.java       |    0
 .../applib}/annotation/MementoSerialization.java   |    0
 .../apache/isis/applib}/annotation/MinLength.java  |    0
 .../org/apache/isis/applib}/annotation/Mixin.java  |    0
 .../org/apache/isis/applib}/annotation/Module.java |    0
 .../org/apache/isis/applib}/annotation/Nature.java |    0
 .../isis/applib}/annotation/NatureOfService.java   |    0
 .../apache/isis/applib}/annotation/Navigable.java  |    0
 .../isis/applib}/annotation/Optionality.java       |    0
 .../isis/applib}/annotation/OrderPrecedence.java   |    0
 .../apache/isis/applib}/annotation/Parameter.java  |    0
 .../isis/applib}/annotation/ParameterLayout.java   |    0
 .../isis/applib}/annotation/Programmatic.java      |    0
 .../apache/isis/applib}/annotation/Projecting.java |    0
 .../isis/applib}/annotation/PromptStyle.java       |    0
 .../apache/isis/applib}/annotation/Property.java   |    0
 .../isis/applib}/annotation/PropertyLayout.java    |    0
 .../apache/isis/applib}/annotation/Publishing.java |    0
 .../applib}/annotation/PublishingChangeKind.java   |    0
 .../apache/isis/applib}/annotation/Redirect.java   |    0
 .../apache/isis/applib}/annotation/RenderDay.java  |    0
 .../apache/isis/applib}/annotation/Repainting.java |    0
 .../apache/isis/applib}/annotation/RestrictTo.java |    0
 .../isis/applib}/annotation/SemanticsOf.java       |    0
 .../org/apache/isis/applib}/annotation/Title.java  |    0
 .../org/apache/isis/applib/annotation/Value.java   |    0
 .../apache/isis/applib}/annotation/ViewModel.java  |    0
 .../isis/applib}/annotation/ViewModelLayout.java   |    0
 .../org/apache/isis/applib}/annotation/Where.java  |    0
 .../isis/applib}/annotation/package-info.java      |    0
 .../apache/isis/applib/client/SuppressionType.java |   91 +
 .../java/org/apache/isis/applib}/clock/Clock.java  |    0
 .../apache/isis/applib}/clock/package-info.java    |    0
 .../isis/applib/domain/DomainObjectList.java       |    0
 .../events/ActionArgumentUsabilityEvent.java       |    0
 .../events/ActionArgumentVisibilityEvent.java      |    0
 .../applib/events/domain/AbstractDomainEvent.java  |  347 ++++
 .../applib}/events/domain/ActionDomainEvent.java   |    0
 .../events/domain/CollectionDomainEvent.java       |    0
 .../isis/applib/events/domain/EventObjectBase.java |   79 +
 .../applib}/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
 .../isis/applib/events/ui/AbstractUiEvent.java     |    0
 .../isis/applib}/events/ui/CssClassUiEvent.java    |    0
 .../apache/isis/applib}/events/ui/IconUiEvent.java |    0
 .../isis/applib}/events/ui/LayoutUiEvent.java      |    0
 .../isis/applib}/events/ui/TitleUiEvent.java       |    0
 .../jaxbadapters/PersistentEntitiesAdapter.java    |    0
 .../jaxbadapters/PersistentEntityAdapter.java      |    0
 .../applib}/layout/component/ActionLayoutData.java |    0
 .../layout/component/ActionLayoutDataOwner.java    |    0
 .../layout/component/CollectionLayoutData.java     |    0
 .../component/CollectionLayoutDataOwner.java       |    0
 .../layout/component/DomainObjectLayoutData.java   |    0
 .../component/DomainObjectLayoutDataOwner.java     |    0
 .../isis/applib/layout/component/FieldSet.java     |    0
 .../applib}/layout/component/FieldSetOwner.java    |    0
 .../applib}/layout/component/HasBookmarking.java   |    0
 .../isis/applib}/layout/component/HasCssClass.java |    0
 .../applib}/layout/component/HasCssClassFa.java    |    0
 .../applib}/layout/component/HasDescribedAs.java   |    0
 .../isis/applib}/layout/component/HasHidden.java   |    0
 .../isis/applib}/layout/component/HasNamed.java    |    0
 .../applib}/layout/component/MemberRegion.java     |    0
 .../layout/component/MemberRegionOwner.java        |    0
 .../isis/applib}/layout/component/Owned.java       |    0
 .../isis/applib}/layout/component/Owner.java       |    0
 .../layout/component/PropertyLayoutData.java       |    0
 .../layout/component/ServiceActionLayoutData.java  |    0
 .../component/ServiceActionLayoutDataOwner.java    |    0
 .../applib}/layout/component/package-info.java     |    0
 .../org/apache/isis/applib}/layout/grid/Grid.java  |    0
 .../isis/applib/layout/grid/GridAbstract.java      |    0
 .../layout/grid/bootstrap3/BS3ClearFix.java        |    0
 .../layout/grid/bootstrap3/BS3ClearFixHidden.java  |    0
 .../layout/grid/bootstrap3/BS3ClearFixVisible.java |    0
 .../isis/applib/layout/grid/bootstrap3/BS3Col.java |    0
 .../applib}/layout/grid/bootstrap3/BS3Element.java |    0
 .../layout/grid/bootstrap3/BS3ElementAbstract.java |    0
 .../applib/layout/grid/bootstrap3/BS3Grid.java     |    0
 .../isis/applib/layout/grid/bootstrap3/BS3Row.java |    0
 .../layout/grid/bootstrap3/BS3RowContent.java      |    0
 .../layout/grid/bootstrap3/BS3RowContentOwner.java |    0
 .../layout/grid/bootstrap3/BS3RowOwner.java        |    0
 .../isis/applib/layout/grid/bootstrap3/BS3Tab.java |    0
 .../applib/layout/grid/bootstrap3/BS3TabGroup.java |    0
 .../layout/grid/bootstrap3/BS3TabGroupOwner.java   |    0
 .../layout/grid/bootstrap3/BS3TabOwner.java        |    0
 .../applib}/layout/grid/bootstrap3/HasCssId.java   |    0
 .../isis/applib}/layout/grid/bootstrap3/Size.java  |    0
 .../applib}/layout/grid/bootstrap3/SizeSpan.java   |    0
 .../applib}/layout/grid/bootstrap3/WithinGrid.java |    0
 .../layout/grid/bootstrap3/package-info.java       |    0
 .../org/apache/isis/applib}/layout/links/Link.java |    0
 .../isis/applib}/layout/links/package-info.java    |    0
 .../apache/isis/applib}/layout/menubars/Menu.java  |    0
 .../isis/applib}/layout/menubars/MenuBar.java      |    0
 .../isis/applib}/layout/menubars/MenuBars.java     |    0
 .../applib/layout/menubars/MenuBarsAbstract.java   |    0
 .../isis/applib}/layout/menubars/MenuSection.java  |    0
 .../applib/layout/menubars/bootstrap3/BS3Menu.java |    0
 .../layout/menubars/bootstrap3/BS3MenuBar.java     |    0
 .../layout/menubars/bootstrap3/BS3MenuBars.java    |  227 +++
 .../layout/menubars/bootstrap3/BS3MenuSection.java |    0
 .../layout/menubars/bootstrap3/package-info.java   |    0
 .../apache/isis/applib}/layout/package-info.java   |    0
 .../apache/isis/applib}/mixins/MixinConstants.java |    0
 .../org/apache/isis/applib}/mixins/dto/Dto.java    |    0
 .../isis/applib/mixins/dto/DtoMappingHelper.java   |   78 +
 .../isis/applib}/mixins/dto/Dto_downloadXml.java   |    0
 .../isis/applib/mixins/dto/Dto_downloadXsd.java    |    0
 .../isis/applib}/mixins/dto/package-info.java      |    0
 .../mixins/layout/Object_downloadLayoutXml.java    |    0
 .../applib}/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
 .../applib}/mixins/timestamp/HoldsUpdatedAt.java   |    0
 .../applib}/mixins/timestamp/HoldsUpdatedBy.java   |    0
 .../applib}/mixins/timestamp/Timestampable.java    |    0
 .../applib}/mixins/timestamp/package-info.java     |    0
 .../java/org/apache/isis/applib/package-info.java  |    0
 .../java/org/apache/isis/applib/query/Query.java   |    0
 .../apache/isis/applib/query/QueryAbstract.java    |   92 +
 .../org/apache/isis/applib/query/QueryDefault.java |    0
 .../isis/applib/query/QueryFindAllInstances.java   |    0
 .../org/apache/isis/applib/query/package-info.java |    0
 .../apache/isis/applib}/security/RoleMemento.java  |    0
 .../apache/isis/applib}/security/UserMemento.java  |    0
 .../apache/isis/applib}/security/package-info.java |    0
 .../apache/isis/applib}/services/HasUniqueId.java  |    0
 .../apache/isis/applib}/services/HasUsername.java  |    0
 .../RepresentsInteractionMemberExecution.java      |    0
 .../applib}/services/WithTransactionScope.java     |    0
 .../services/acceptheader/AcceptHeaderService.java |    0
 .../appfeat/ApplicationFeatureRepository.java      |    0
 .../services/appfeat/ApplicationMemberType.java    |   33 +
 .../applib}/services/appfeat/package-info.java     |    0
 .../services/audit/AuditEntryPropertyIdType.java   |    0
 .../audit/AuditEntryPropertyValueType.java         |    0
 .../applib}/services/audit/AuditerService.java     |    0
 .../services/audit/AuditerServiceLogging.java      |    0
 .../isis/applib}/services/audit/package-info.java  |    0
 .../background/BackgroundCommandService.java       |    0
 .../applib}/services/background/package-info.java  |    0
 .../isis/applib/services/bookmark/Bookmark.java    |  187 ++
 .../applib}/services/bookmark/BookmarkHolder.java  |    0
 .../services/bookmark/BookmarkHolder_lookup.java   |    0
 .../services/bookmark/BookmarkHolder_object.java   |    0
 .../applib/services/bookmark/BookmarkService.java  |   70 +
 .../applib}/services/bookmark/package-info.java    |    0
 .../services/bookmarkui/BookmarkUiService.java     |    0
 .../isis/applib}/services/clock/ClockService.java  |    0
 .../isis/applib}/services/clock/package-info.java  |    0
 .../isis/applib}/services/command/Command.java     |    0
 .../applib}/services/command/CommandContext.java   |    0
 .../applib}/services/command/CommandDefault.java   |    0
 .../services/command/CommandDtoProcessor.java      |    0
 .../CommandDtoProcessorForActionAbstract.java      |    0
 .../CommandDtoProcessorForPropertyAbstract.java    |    0
 .../services/command/CommandExecutorService.java   |    0
 .../applib}/services/command/CommandWithDto.java   |    0
 .../applib}/services/command/package-info.java     |    0
 .../services/command/spi/CommandService.java       |    0
 .../services/confview/ConfigurationMenu.java       |    0
 .../services/confview/ConfigurationProperty.java   |   84 +
 .../confview/ConfigurationProperty.layout.xml      |    0
 .../services/confview/ConfigurationProperty.png    |  Bin
 .../confview/ConfigurationViewService.java         |    0
 .../applib}/services/confview/package-info.java    |    0
 .../services/conmap/ContentMappingService.java     |   66 +
 .../ContentMappingServiceForCommandDto.java        |    0
 .../ContentMappingServiceForCommandsDto.java       |    0
 .../command/spi/CommandDtoProcessorService.java    |    0
 .../isis/applib}/services/conmap/package-info.java |    0
 .../isis/applib}/services/email/EmailService.java  |    0
 .../isis/applib}/services/email/package-info.java  |    0
 .../isis/applib}/services/error/ErrorDetails.java  |    0
 .../services/error/ErrorReportingService.java      |    0
 .../apache/isis/applib}/services/error/Ticket.java |    0
 .../isis/applib}/services/error/package-info.java  |    0
 .../applib}/services/eventbus/EventBusService.java |    0
 .../applib}/services/eventbus/package-info.java    |    0
 .../services/exceprecog/ExceptionRecognizer.java   |    0
 .../exceprecog/ExceptionRecognizerAbstract.java    |  171 ++
 .../exceprecog/ExceptionRecognizerComposite.java   |  178 ++
 .../exceprecog/ExceptionRecognizerForType.java     |  181 ++
 .../services/exceprecog/TranslatableException.java |    0
 .../applib}/services/exceprecog/package-info.java  |    0
 .../applib}/services/factory/FactoryService.java   |    0
 .../applib}/services/factory/package-info.java     |    0
 .../applib}/services/grid/GridLoaderService.java   |    0
 .../isis/applib}/services/grid/GridService.java    |    0
 .../applib}/services/grid/GridSystemService.java   |    0
 .../isis/applib}/services/grid/package-info.java   |    0
 .../isis/applib}/services/health/Health.java       |    0
 .../services/health/HealthCheckService.java        |    0
 .../isis/applib}/services/hint/HintStore.java      |    0
 .../isis/applib}/services/hint/package-info.java   |    0
 .../isis/applib}/services/i18n/LocaleProvider.java |    0
 .../applib/services/i18n/TranslatableString.java   |  274 +++
 .../applib}/services/i18n/TranslationService.java  |    0
 .../services/i18n/TranslationsResolver.java        |    0
 .../isis/applib}/services/i18n/package-info.java   |    0
 .../isis/applib/services/iactn/Interaction.java    |  722 ++++++++
 .../applib}/services/iactn/InteractionContext.java |    0
 .../isis/applib}/services/iactn/package-info.java  |    0
 .../applib}/services/inject/ServiceInjector.java   |    0
 .../jaxb/CatalogingSchemaOutputResolver.java       |  154 ++
 .../isis/applib/services/jaxb/JaxbService.java     |  253 +++
 .../applib}/services/jaxb/JaxbServiceDefault.java  |    0
 .../services/jaxb/StreamResultWithWriter.java      |    0
 .../isis/applib}/services/jaxb/package-info.java   |    0
 .../applib}/services/layout/LayoutService.java     |    0
 .../applib/services/layout/LayoutServiceMenu.java  |  121 ++
 .../isis/applib}/services/layout/package-info.java |    0
 .../applib}/services/linking/DeepLinkService.java  |    0
 .../applib}/services/linking/package-info.java     |    0
 .../services/menu/MenuBarsLoaderService.java       |    0
 .../applib}/services/menu/MenuBarsService.java     |    0
 .../applib}/services/message/MessageService.java   |    0
 .../applib}/services/message/package-info.java     |    0
 .../applib}/services/metamodel/DomainMember.java   |    0
 .../applib}/services/metamodel/DomainModel.java    |    0
 .../services/metamodel/MetaModelService.java       |  183 ++
 .../services/metamodel/MetaModelServicesMenu.java  |  252 +++
 .../applib}/services/metamodel/package-info.java   |    0
 .../applib}/services/metrics/MetricsService.java   |    0
 .../applib}/services/metrics/package-info.java     |    0
 .../apache/isis/applib}/services/package-info.java |    0
 .../applib}/services/publish/PublishedObjects.java |    0
 .../applib}/services/publish/PublisherService.java |    0
 .../services/publish/PublisherServiceLogging.java  |    0
 .../applib}/services/publish/package-info.java     |    0
 .../queryresultscache/QueryResultCacheControl.java |    0
 .../queryresultscache/QueryResultsCache.java       |    0
 .../QueryResultsCacheDefault.java                  |  163 ++
 .../services/queryresultscache/package-info.java   |    0
 .../applib/services/registry/ServiceRegistry.java  |  173 ++
 .../applib}/services/registry/package-info.java    |    0
 .../services/repository/RepositoryService.java     |    0
 .../applib}/services/repository/package-info.java  |    0
 .../applib}/services/routing/RoutingService.java   |    0
 .../applib}/services/routing/package-info.java     |    0
 .../applib/services/scratchpad/Scratchpad.java     |   78 +
 .../applib}/services/scratchpad/package-info.java  |    0
 .../services/session/SessionLoggingService.java    |    0
 .../applib}/services/session/package-info.java     |    0
 .../sessmgmt/SessionManagementService.java         |    0
 .../applib}/services/sessmgmt/package-info.java    |    0
 .../isis/applib}/services/sudo/SudoService.java    |    0
 .../isis/applib}/services/sudo/package-info.java   |    0
 .../applib}/services/swagger/SwaggerService.java   |    0
 .../applib}/services/swagger/package-info.java     |    0
 .../services/tablecol/TableColumnOrderService.java |    0
 .../isis/applib}/services/title/TitleService.java  |    0
 .../isis/applib}/services/title/package-info.java  |    0
 .../services/urlencoding/UrlEncodingService.java   |   47 +
 ...rlEncodingServiceUsingBaseEncodingAbstract.java |   44 +
 .../UrlEncodingServiceWithCompression.java         |   66 +
 .../applib}/services/urlencoding/package-info.java |    0
 .../isis/applib}/services/user/UserService.java    |    0
 .../isis/applib}/services/user/package-info.java   |    0
 .../services/userprof/UserProfileService.java      |    0
 .../applib}/services/userprof/package-info.java    |    0
 .../services/userreg/EmailNotificationService.java |    0
 .../isis/applib}/services/userreg/UserDetails.java |    0
 .../services/userreg/UserRegistrationService.java  |    0
 .../userreg/events/EmailEventAbstract.java         |    0
 .../userreg/events/EmailRegistrationEvent.java     |    0
 .../userreg/events/PasswordResetEvent.java         |    0
 .../applib}/services/userreg/package-info.java     |    0
 .../isis/applib}/services/wrapper/AsyncWrap.java   |    0
 .../services/wrapper/DisabledException.java        |    0
 .../applib}/services/wrapper/HiddenException.java  |    0
 .../services/wrapper/InteractionException.java     |    0
 .../applib}/services/wrapper/InvalidException.java |    0
 .../applib}/services/wrapper/WrapperFactory.java   |    0
 .../applib}/services/wrapper/WrappingObject.java   |    0
 .../services/wrapper/events/AccessEvent.java       |    0
 .../wrapper/events/ActionArgumentEvent.java        |    0
 .../wrapper/events/ActionInvocationEvent.java      |    0
 .../wrapper/events/ActionUsabilityEvent.java       |    0
 .../wrapper/events/ActionVisibilityEvent.java      |    0
 .../wrapper/events/CollectionAccessEvent.java      |    0
 .../wrapper/events/CollectionAddToEvent.java       |    0
 .../wrapper/events/CollectionMethodEvent.java      |    0
 .../wrapper/events/CollectionRemoveFromEvent.java  |    0
 .../wrapper/events/CollectionUsabilityEvent.java   |    0
 .../wrapper/events/CollectionVisibilityEvent.java  |    0
 .../services/wrapper/events/InteractionEvent.java  |    0
 .../services/wrapper/events/ObjectTitleEvent.java  |    0
 .../wrapper/events/ObjectValidityEvent.java        |    0
 .../wrapper/events/ObjectVisibilityEvent.java      |    0
 .../services/wrapper/events/ParseValueEvent.java   |    0
 .../wrapper/events/PropertyAccessEvent.java        |    0
 .../wrapper/events/PropertyModifyEvent.java        |    0
 .../wrapper/events/PropertyUsabilityEvent.java     |    0
 .../wrapper/events/PropertyVisibilityEvent.java    |    0
 .../wrapper/events/ProposedHolderEvent.java        |    0
 .../services/wrapper/events/UsabilityEvent.java    |    0
 .../services/wrapper/events/ValidityEvent.java     |    0
 .../services/wrapper/events/VisibilityEvent.java   |    0
 .../services/wrapper/events/package-info.java      |    0
 .../wrapper/listeners/InteractionAdapter.java      |    0
 .../wrapper/listeners/InteractionListener.java     |    0
 .../applib}/services/wrapper/package-info.java     |    0
 .../isis/applib}/services/xactn/Transaction.java   |    0
 .../isis/applib}/services/xactn/TransactionId.java |    0
 .../applib}/services/xactn/TransactionService.java |    0
 .../applib}/services/xactn/TransactionState.java   |    0
 .../isis/applib}/services/xactn/package-info.java  |    0
 .../services/xmlsnapshot/XmlSnapshotService.java   |    0
 .../xmlsnapshot/XmlSnapshotServiceAbstract.java    |    0
 .../applib}/services/xmlsnapshot/package-info.java |    0
 .../snapshot/SnapshottableWithInclusions.java      |    0
 .../apache/isis/applib/snapshot/package-info.java  |    0
 .../isis/applib}/spec/AbstractSpecification.java   |    0
 .../isis/applib/spec/AbstractSpecification2.java   |  112 ++
 .../apache/isis/applib}/spec/Specification.java    |    0
 .../apache/isis/applib}/spec/Specification2.java   |    0
 .../apache/isis/applib}/spec/SpecificationAnd.java |    0
 .../apache/isis/applib}/spec/SpecificationNot.java |    0
 .../apache/isis/applib}/spec/SpecificationOr.java  |    0
 .../org/apache/isis/applib}/spec/package-info.java |    0
 .../org/apache/isis/applib/tree/LazyTreeNode.java  |  142 ++
 .../org/apache/isis/applib}/tree/TreeAdapter.java  |    0
 .../java/org/apache/isis/applib/tree/TreeNode.java |  155 ++
 .../tree/TreeNode_iteratorBreadthFirst.java        |    0
 .../applib}/tree/TreeNode_iteratorDepthFirst.java  |    0
 .../applib}/tree/TreeNode_iteratorHierarchyUp.java |    0
 .../org/apache/isis/applib}/tree/TreePath.java     |    0
 .../apache/isis/applib}/tree/TreePath_Default.java |    0
 .../org/apache/isis/applib}/tree/TreeState.java    |    0
 .../isis/applib}/tree/TreeState_Default.java       |    0
 .../apache/isis/applib/types/DescriptionType.java  |    0
 .../isis/applib/types/MemberIdentifierType.java    |    0
 .../apache/isis/applib/types/TargetActionType.java |    0
 .../apache/isis/applib/types/TargetClassType.java  |    0
 .../org/apache/isis/applib/types/package-info.java |    0
 .../java/org/apache/isis/applib/util/Enums.java    |   87 +
 .../java/org/apache/isis/applib/util/Equality.java |   75 +
 .../java/org/apache/isis/applib/util/Hashing.java  |   66 +
 .../org/apache/isis/applib/util/JaxbAdapters.java  |  201 +++
 .../java/org/apache/isis/applib/util/JaxbUtil.java |  109 ++
 .../isis/applib}/util/ObjectContract_Empty.java    |    0
 .../isis/applib}/util/ObjectContract_Impl.java     |    0
 .../isis/applib/util/ObjectContract_Parser.java    |  179 ++
 .../apache/isis/applib/util/ObjectContracts.java   |  231 +++
 .../org/apache/isis/applib}/util/ReasonBuffer.java |    0
 .../org/apache/isis/applib/util/ReasonBuffer2.java |  227 +++
 .../java/org/apache/isis/applib}/util/Reasons.java |    0
 .../org/apache/isis/applib/util/TitleBuffer.java   |  467 +++++
 .../isis/applib}/util/TitleBufferException.java    |    0
 .../java/org/apache/isis/applib/util/ToString.java |  123 ++
 .../org/apache/isis/applib/util/ZipWriter.java     |  118 ++
 .../org/apache/isis/applib}/util/package-info.java |    0
 .../isis/applib/util/schema/ChangesDtoUtils.java   |  101 ++
 .../isis/applib/util/schema/CommandDtoUtils.java   |  149 ++
 .../isis/applib/util/schema/CommonDtoUtils.java    |  494 ++++++
 .../applib/util/schema/InteractionDtoUtils.java    |  450 +++++
 .../util/schema/MemberExecutionDtoUtils.java       |  119 ++
 .../java/org/apache/isis/applib}/value/Blob.java   |    0
 .../apache/isis/applib/value/BlobClobFactory.java  |  151 ++
 .../java/org/apache/isis/applib}/value/Clob.java   |    0
 .../java/org/apache/isis/applib}/value/Image.java  |    0
 .../isis/applib}/value/LocalResourcePath.java      |    0
 .../java/org/apache/isis/applib}/value/Markup.java |    0
 .../isis/applib}/value/NamedWithMimeType.java      |    0
 .../org/apache/isis/applib}/value/Password.java    |    0
 .../apache/isis/applib}/value/package-info.java    |    0
 .../org/apache/isis/applib/IdentifierTests.java    |    0
 .../org/apache/isis/applib/SomeDomainClass.java    |    0
 .../isis/applib/events/InteractionEventTest.java   |    0
 ...ropertyLayoutData_renderedAsDayBefore_Test.java |    0
 .../component/PropertyLayoutData_repaint_Test.java |    0
 .../applib/layout/grid/bootstrap3/BS3ColTest.java  |    0
 .../layout/grid/bootstrap3/SizeSpanTest.java       |    0
 .../bootstrap3/BS3MenuBars_roundtrip_Test.java     |    0
 .../QueryDefaultTest_withStart_or_withCount.java   |    0
 .../appfeat/ApplicationMemberTypeTest.java         |    0
 .../eventbus/AbstractDomainEvent_veto_Test.java    |    0
 .../ExceptionRecognizerCompositeTest.java          |    0
 .../exceprecog/ExceptionRecognizerForTypeTest.java |    0
 .../exceprecog/ExceptionRecognizerGeneralTest.java |    0
 .../services/i18n/TranslatableStringTest.java      |    0
 .../interaction/InteractionDefaultTest_next.java   |    0
 .../metamodel/MetaModelService_Config_Test.java    |    0
 .../QueryResultsCache_KeyTest.java                 |    0
 .../applib/services/urlencoding/MementosTest.java  |  134 ++
 .../urlencoding/UrlEncodingServiceTest.java        |    0
 .../XmlSnapshotServiceAbstractTest.java            |  115 ++
 .../xmlsnapshot/XmlSnapshotServiceAbstractTest.xml |    0
 .../applib/spec/AbstractSpecification2Test.java    |    0
 .../applib/spec/AbstractSpecificationTest.java     |    0
 .../org/apache/isis/applib/tree/TreePathTest.java  |    0
 .../org/apache/isis/applib/util/EnumsTest.java     |    0
 .../isis/applib/util/EnumsTest_converts.java       |    0
 .../java/org/apache/isis/applib/util/Invoice.java  |    0
 .../org/apache/isis/applib/util/InvoiceItem.java   |    0
 .../java/org/apache/isis/applib/util/Numbered.java |    0
 .../apache/isis/applib/util/NumberedEvaluator.java |    0
 .../applib/util/ObjectContractsTest_compareTo.java |    0
 .../applib/util/ObjectContractsTest_equals.java    |    0
 .../ObjectContractsTest_equals_and_hashCode.java   |  128 ++
 .../applib/util/ObjectContractsTest_toString.java  |    0
 .../apache/isis/applib/util/ReasonBufferTest.java  |    0
 .../org/apache/isis/applib/util/ReasonsTest.java   |    0
 .../apache/isis/applib/util/TitleBufferTest.java   |    0
 .../apache/isis/applib/util/TitleTestObject.java   |    0
 .../applib/util/schema/CommandDtoUtils_Test.java   |    0
 .../applib/util/schema/CommonDtoUtils_Test.java    |    0
 .../schema/CommonDtoUtils_setValueOn_Test.java     |    0
 ...eractionDtoUtilsTest_deriveLogicalMemberId.java |    0
 .../apache/isis/applib/util/schema/Roundtrip.java  |    0
 .../apache/isis/applib/util/schema/Vertical.java   |    0
 .../isis/applib/value/BlobTest_constructor.java    |    0
 .../isis/applib/value/ClobTest_constructor.java    |    0
 .../org/apache/isis/applib/value/PasswordTest.java |    0
 .../org/apache/isis/applib/value/TestClock.java    |    0
 .../unittestsupport => api/schema}/.gitignore      |    0
 api/schema/pom.xml                                 |  176 ++
 .../applib => api/schema}/src/main/doc/antora.yml  |    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
 .../modules/schema}/images/value-types/markup.png  |  Bin
 .../schema/src/main/doc/modules/schema}/nav.adoc   |    0
 .../src/main/doc/modules/schema/pages/about.adoc   |    0
 .../src/main/doc/modules/schema/pages/aim.adoc     |    0
 .../src/main/doc/modules/schema/pages/chg.adoc     |    0
 .../src/main/doc/modules/schema/pages/cmd.adoc     |    0
 .../src/main/doc/modules/schema/pages/common.adoc  |    0
 .../src/main/doc/modules/schema/pages/ixn.adoc     |    0
 .../src/main/doc/modules/schema/pages/mml.adoc     |    0
 .../doc/modules/schema/partials/module-nav.adoc    |    0
 .../org/apache/isis/schema/IsisModuleSchema.java   |    0
 ...avaSqlTimestampXmlGregorianCalendarAdapter.java |    0
 .../jaxbadapters/JodaDateTimeStringAdapter.java    |    0
 .../JodaDateTimeXMLGregorianCalendarAdapter.java   |    0
 .../jaxbadapters/JodaLocalDateStringAdapter.java   |    0
 .../JodaLocalDateTimeStringAdapter.java            |    0
 ...daLocalDateTimeXMLGregorianCalendarAdapter.java |    0
 .../JodaLocalDateXMLGregorianCalendarAdapter.java  |    0
 .../jaxbadapters/JodaLocalTimeStringAdapter.java   |    0
 .../JodaLocalTimeXMLGregorianCalendarAdapter.java  |    0
 .../apache/isis/schema/jaxbadapters/Strings.java   |    0
 .../schema/jaxbadapters/XmlCalendarFactory.java    |    0
 .../resources/org/apache/isis/schema/bindings.xml  |    0
 .../org/apache/isis/schema/chg/chg-1.1.xsd         |    0
 .../org/apache/isis/schema/cmd/cmd-1.4.xsd         |    0
 .../org/apache/isis/schema/common/common-1.1.xsd   |    0
 .../org/apache/isis/schema/ixn/ixn-1.3.xsd         |    0
 .../apache/isis/schema/metamodel/metamodel-1.0.xsd |    0
 core/applib/pom.xml                                |  108 --
 .../examples/events/domain/EventObjectBase.java    |   79 -
 .../layout/menubars/bootstrap3/BS3MenuBars.java    |  227 ---
 .../examples/mixins/dto/DtoMappingHelper.java      |   78 -
 .../examples/spec/AbstractSpecification2.java      |  112 --
 .../applib-cm/examples/tree/LazyTreeNode.java      |  142 --
 .../modules/applib-cm/examples/tree/TreeNode.java  |  155 --
 .../doc/modules/applib-cm/examples/util/Enums.java |   87 -
 .../modules/applib-cm/examples/util/Equality.java  |   75 -
 .../modules/applib-cm/examples/util/Hashing.java   |   66 -
 .../applib-cm/examples/util/JaxbAdapters.java      |  201 ---
 .../modules/applib-cm/examples/util/JaxbUtil.java  |  109 --
 .../examples/util/ObjectContract_Parser.java       |  179 --
 .../applib-cm/examples/util/ObjectContracts.java   |  231 ---
 .../applib-cm/examples/util/ReasonBuffer2.java     |  227 ---
 .../applib-cm/examples/util/TitleBuffer.java       |  467 -----
 .../modules/applib-cm/examples/util/ToString.java  |  123 --
 .../examples/util/schema/ChangesDtoUtils.java      |  101 --
 .../examples/util/schema/CommandDtoUtils.java      |  149 --
 .../examples/util/schema/CommonDtoUtils.java       |  494 ------
 .../examples/util/schema/InteractionDtoUtils.java  |  450 -----
 .../util/schema/MemberExecutionDtoUtils.java       |  119 --
 .../applib-cm/examples/value/BlobClobFactory.java  |  151 --
 .../services/appfeat/ApplicationMemberType.java    |   33 -
 .../examples/services/bookmark/Bookmark.java       |  187 --
 .../services/bookmark/BookmarkService.java         |   70 -
 .../services/confview/ConfigurationProperty.java   |   84 -
 .../services/conmap/ContentMappingService.java     |   66 -
 .../exceprecog/ExceptionRecognizerAbstract.java    |  171 --
 .../exceprecog/ExceptionRecognizerComposite.java   |  178 --
 .../exceprecog/ExceptionRecognizerForType.java     |  181 --
 .../examples/services/i18n/TranslatableString.java |  274 ---
 .../examples/services/iactn/Interaction.java       |  722 --------
 .../jaxb/CatalogingSchemaOutputResolver.java       |  154 --
 .../examples/services/jaxb/JaxbService.java        |  253 ---
 .../services/layout/LayoutServiceMenu.java         |  121 --
 .../services/metamodel/MetaModelService.java       |  183 --
 .../services/metamodel/MetaModelServicesMenu.java  |  252 ---
 .../QueryResultsCacheDefault.java                  |  163 --
 .../services/registry/ServiceRegistry.java         |  173 --
 .../examples/services/scratchpad/Scratchpad.java   |   78 -
 .../services/urlencoding/UrlEncodingService.java   |   47 -
 ...rlEncodingServiceUsingBaseEncodingAbstract.java |   44 -
 .../UrlEncodingServiceWithCompression.java         |   66 -
 .../java/org/apache/isis/applib/Identifier.java    |  444 -----
 .../isis/applib/NonRecoverableException.java       |  142 --
 .../apache/isis/applib/RecoverableException.java   |  136 --
 .../apache/isis/applib/client/SuppressionType.java |   91 -
 .../applib/events/domain/AbstractDomainEvent.java  |  349 ----
 .../apache/isis/applib/query/QueryAbstract.java    |   92 -
 .../org/apache/isis/applib/util/ZipWriter.java     |  118 --
 .../applib/services/urlencoding/MementosTest.java  |  134 --
 .../XmlSnapshotServiceAbstractTest.java            |  115 --
 .../ObjectContractsTest_equals_and_hashCode.java   |  128 --
 core/codegen-bytebuddy/pom.xml                     |    4 +-
 .../bytebuddy/IsisModuleCodegenByteBuddy.java      |   18 -
 .../services/ClassLoadingStrategyAdvisor.java      |   92 -
 .../services/ProxyFactoryServiceByteBuddy.java     |  147 --
 .../bytebuddy/IsisModuleCoreCodegenByteBuddy.java  |   18 +
 .../services/ClassLoadingStrategyAdvisor.java      |   92 +
 .../services/ProxyFactoryServiceByteBuddy.java     |  147 ++
 .../org/apache/isis/commons/IsisModuleCommons.java |   14 -
 .../org/apache/isis/commons/collections/Can.java   |  518 ------
 .../apache/isis/commons/collections/Can_Empty.java |  133 --
 .../isis/commons/collections/Can_Multiple.java     |  152 --
 .../isis/commons/collections/Can_Singleton.java    |  144 --
 .../isis/commons/collections/Cardinality.java      |   54 -
 .../isis/commons/concurrent/AwaitableLatch.java    |   66 -
 .../isis/commons/exceptions/ExceptionUtils.java    |  350 ----
 .../exceptions/IsisApplicationException.java       |   54 -
 .../isis/commons/exceptions/IsisException.java     |   49 -
 .../exceptions/UnexpectedCallException.java        |   33 -
 .../commons/exceptions/UnknownTypeException.java   |   33 -
 .../isis/commons/exceptions/package-info.java      |   25 -
 .../commons/handler/ChainOfResponsibility.java     |   81 -
 .../apache/isis/commons/internal/_Constants.java   |   98 --
 .../isis/commons/internal/assertions/_Assert.java  |   67 -
 .../isis/commons/internal/base/_Blackhole.java     |   80 -
 .../apache/isis/commons/internal/base/_Bytes.java  |  245 ---
 .../internal/base/_Bytes_GZipCompressor.java       |   65 -
 .../internal/base/_Bytes_GZipCompressorSmart.java  |   74 -
 .../apache/isis/commons/internal/base/_Casts.java  |  150 --
 .../apache/isis/commons/internal/base/_Either.java |  149 --
 .../apache/isis/commons/internal/base/_Lazy.java   |   84 -
 .../isis/commons/internal/base/_Lazy_Simple.java   |   60 -
 .../commons/internal/base/_Lazy_ThreadSafe.java    |   66 -
 .../isis/commons/internal/base/_NullSafe.java      |  252 ---
 .../isis/commons/internal/base/_Reduction.java     |  102 --
 .../isis/commons/internal/base/_Strings.java       |  581 -------
 .../commons/internal/base/_Strings_FastSplit.java  |   66 -
 .../internal/base/_Strings_HtmlEscaper.java        |   56 -
 .../internal/base/_Strings_KeyValuePair.java       |   86 -
 .../internal/base/_Strings_NaturalNames.java       |   91 -
 .../internal/base/_Strings_SplitIterator.java      |   76 -
 .../apache/isis/commons/internal/base/_Timing.java |  133 --
 .../apache/isis/commons/internal/base/_Tuples.java |   77 -
 .../apache/isis/commons/internal/base/_With.java   |  340 ----
 .../isis/commons/internal/base/package-info.java   |   28 -
 .../isis/commons/internal/collections/_Arrays.java |  442 -----
 .../internal/collections/_Arrays_Collector.java    |   99 --
 .../collections/_Arrays_CollectorUnknownSize.java  |   82 -
 .../commons/internal/collections/_Collections.java |  324 ----
 .../collections/_Collections_Collector.java        |   81 -
 .../collections/_Collections_SortedSetOfList.java  |  152 --
 .../isis/commons/internal/collections/_Inbox.java  |   84 -
 .../isis/commons/internal/collections/_Lists.java  |  200 ---
 .../isis/commons/internal/collections/_Maps.java   |  358 ----
 .../commons/internal/collections/_Multimaps.java   |  393 -----
 .../isis/commons/internal/collections/_Sets.java   |  320 ----
 .../commons/internal/collections/_Streams.java     |  105 --
 .../commons/internal/collections/package-info.java |   28 -
 .../collections/snapshot/_VersionedList.java       |  217 ---
 .../commons/internal/compare/_Comparators.java     |   53 -
 .../compare/_Comparators_SequenceCompare.java      |  109 --
 .../commons/internal/compare/package-info.java     |   28 -
 .../internal/concurrent/_ConcurrentContext.java    |   55 -
 .../internal/concurrent/_ConcurrentTask.java       |  188 --
 .../internal/concurrent/_ConcurrentTaskList.java   |  200 ---
 .../isis/commons/internal/context/_Context.java    |  375 ----
 .../internal/context/_Context_ThreadLocal.java     |  152 --
 .../isis/commons/internal/context/_Plugin.java     |  186 --
 .../commons/internal/context/package-info.java     |   28 -
 .../apache/isis/commons/internal/debug/_Probe.java |  236 ---
 .../isis/commons/internal/debug/package-info.java  |   28 -
 .../internal/encoding/DataInputExtended.java       |   58 -
 .../encoding/DataInputExtendedDecorator.java       |  203 ---
 .../internal/encoding/DataInputStreamExtended.java |  206 ---
 .../internal/encoding/DataOutputExtended.java      |   68 -
 .../encoding/DataOutputExtendedDecorator.java      |  206 ---
 .../encoding/DataOutputStreamExtended.java         |  227 ---
 .../internal/encoding/DebugDataInputExtended.java  |  103 --
 .../internal/encoding/DebugDataOutputExtended.java |  100 --
 .../isis/commons/internal/encoding/Encodable.java  |   40 -
 .../internal/encoding/EncodingConstants.java       |   29 -
 .../internal/encoding/FailedToDecodeException.java |   42 -
 .../encoding/FailedToDeserializeException.java     |   42 -
 .../isis/commons/internal/encoding/FieldType.java  | 1361 ---------------
 .../internal/environment/DeploymentType.java       |   39 -
 .../environment/IsisSystemEnvironment.java         |  203 ---
 .../commons/internal/exceptions/_Exceptions.java   |  407 -----
 .../commons/internal/exceptions/package-info.java  |   28 -
 .../factory/InstanceCreationClassException.java    |   34 -
 .../factory/InstanceCreationException.java         |   34 -
 .../commons/internal/factory/InstanceUtil.java     |  174 --
 .../factory/UnavailableClassException.java         |   42 -
 .../commons/internal/factory/package-info.java     |   28 -
 .../commons/internal/functions/_Functions.java     |  204 ---
 .../_Functions_IndexAwareFunctionAdapter.java      |   44 -
 .../commons/internal/functions/_Predicates.java    |   88 -
 .../commons/internal/functions/package-info.java   |   28 -
 .../apache/isis/commons/internal/ioc/BeanSort.java |   96 --
 .../isis/commons/internal/ioc/IocContainer.java    |   69 -
 .../commons/internal/ioc/ManagedBeanAdapter.java   |   34 -
 .../commons/internal/ioc/PriorityConstants.java    |   53 -
 .../commons/internal/ioc/cdi/BeanAdapterCDI.java   |   54 -
 .../isis/commons/internal/ioc/cdi/CdiPlugin.java   |   52 -
 .../apache/isis/commons/internal/ioc/cdi/_CDI.java |  242 ---
 .../commons/internal/ioc/cdi/_CDI_Lifecycle.java   |   44 -
 .../internal/ioc/spring/BeanAdapterSpring.java     |   52 -
 .../commons/internal/ioc/spring/EventSpring.java   |   75 -
 .../internal/ioc/spring/IocContainerSpring.java    |  123 --
 .../isis/commons/internal/ioc/spring/_Spring.java  |  228 ---
 .../isis/commons/internal/memento/_Mementos.java   |  195 ---
 .../internal/memento/_Mementos_MementoDefault.java |  133 --
 .../commons/internal/memento/package-info.java     |   28 -
 .../apache/isis/commons/internal/package-info.java |   28 -
 .../internal/plugins/PluginResolveException.java   |   37 -
 .../internal/plugins/codegen/ProxyFactory.java     |   77 -
 .../plugins/codegen/ProxyFactoryService.java       |   34 -
 .../plugins/ioc/ConversationContextHandle.java     |   30 -
 .../plugins/ioc/ConversationContextService.java    |   32 -
 .../ioc/ConversationContextServiceDefault.java     |   38 -
 .../commons/internal/reflection/_Annotations.java  |  230 ---
 .../internal/reflection/_AnnotationsLegacy.java    |  361 ----
 .../reflection/_Annotations_AttributeMethods.java  |  311 ----
 .../reflection/_Annotations_SyntCache.java         |   78 -
 ...nthesizedMergedAnnotationInvocationHandler.java |  235 ---
 .../commons/internal/reflection/_MethodCache.java  |  107 --
 .../isis/commons/internal/reflection/_Reflect.java |  434 -----
 .../commons/internal/reflection/package-info.java  |   28 -
 .../isis/commons/internal/resources/_Json.java     |  329 ----
 .../commons/internal/resources/_Resources.java     |  158 --
 .../commons/internal/resources/package-info.java   |   28 -
 .../isis/commons/internal/url/UrlDecoderUtil.java  |   45 -
 .../isis/core/commons/IsisModuleCoreCommons.java   |   14 +
 .../apache/isis/core/commons/collections/Can.java  |  518 ++++++
 .../isis/core/commons/collections/Can_Empty.java   |  133 ++
 .../core/commons/collections/Can_Multiple.java     |  152 ++
 .../core/commons/collections/Can_Singleton.java    |  144 ++
 .../isis/core/commons/collections/Cardinality.java |   54 +
 .../core/commons/concurrent/AwaitableLatch.java    |   66 +
 .../core/commons/exceptions/ExceptionUtils.java    |  350 ++++
 .../exceptions/IsisApplicationException.java       |   54 +
 .../core/commons/exceptions/IsisException.java     |   49 +
 .../exceptions/UnexpectedCallException.java        |   33 +
 .../commons/exceptions/UnknownTypeException.java   |   33 +
 .../isis/core/commons/exceptions/package-info.java |   25 +
 .../commons/handler/ChainOfResponsibility.java     |   81 +
 .../isis/core/commons/internal/_Constants.java     |   98 ++
 .../core/commons/internal/assertions/_Assert.java  |   67 +
 .../core/commons/internal/base/_Blackhole.java     |   80 +
 .../isis/core/commons/internal/base/_Bytes.java    |  245 +++
 .../internal/base/_Bytes_GZipCompressor.java       |   65 +
 .../internal/base/_Bytes_GZipCompressorSmart.java  |   74 +
 .../isis/core/commons/internal/base/_Casts.java    |  150 ++
 .../isis/core/commons/internal/base/_Either.java   |  149 ++
 .../isis/core/commons/internal/base/_Lazy.java     |   84 +
 .../core/commons/internal/base/_Lazy_Simple.java   |   60 +
 .../commons/internal/base/_Lazy_ThreadSafe.java    |   66 +
 .../isis/core/commons/internal/base/_NullSafe.java |  252 +++
 .../core/commons/internal/base/_Reduction.java     |  102 ++
 .../isis/core/commons/internal/base/_Strings.java  |  581 +++++++
 .../commons/internal/base/_Strings_FastSplit.java  |   66 +
 .../internal/base/_Strings_HtmlEscaper.java        |   54 +
 .../internal/base/_Strings_KeyValuePair.java       |   84 +
 .../internal/base/_Strings_NaturalNames.java       |   91 +
 .../internal/base/_Strings_SplitIterator.java      |   76 +
 .../isis/core/commons/internal/base/_Timing.java   |  133 ++
 .../isis/core/commons/internal/base/_Tuples.java   |   77 +
 .../isis/core/commons/internal/base/_With.java     |  340 ++++
 .../core/commons/internal/base/package-info.java   |   28 +
 .../core/commons/internal/collections/_Arrays.java |  441 +++++
 .../internal/collections/_Arrays_Collector.java    |   99 ++
 .../collections/_Arrays_CollectorUnknownSize.java  |   82 +
 .../commons/internal/collections/_Collections.java |  323 ++++
 .../collections/_Collections_Collector.java        |   81 +
 .../collections/_Collections_SortedSetOfList.java  |  152 ++
 .../core/commons/internal/collections/_Inbox.java  |   84 +
 .../core/commons/internal/collections/_Lists.java  |  199 +++
 .../core/commons/internal/collections/_Maps.java   |  357 ++++
 .../commons/internal/collections/_Multimaps.java   |  392 +++++
 .../core/commons/internal/collections/_Sets.java   |  320 ++++
 .../commons/internal/collections/_Streams.java     |  105 ++
 .../commons/internal/collections/package-info.java |   28 +
 .../collections/snapshot/_VersionedList.java       |  217 +++
 .../commons/internal/compare/_Comparators.java     |   53 +
 .../compare/_Comparators_SequenceCompare.java      |  109 ++
 .../commons/internal/compare/package-info.java     |   28 +
 .../internal/concurrent/_ConcurrentContext.java    |   55 +
 .../internal/concurrent/_ConcurrentTask.java       |  188 ++
 .../internal/concurrent/_ConcurrentTaskList.java   |  200 +++
 .../core/commons/internal/context/_Context.java    |  374 ++++
 .../internal/context/_Context_ThreadLocal.java     |  151 ++
 .../core/commons/internal/context/_Plugin.java     |  185 ++
 .../commons/internal/context/package-info.java     |   28 +
 .../isis/core/commons/internal/debug/_Probe.java   |  236 +++
 .../core/commons/internal/debug/package-info.java  |   28 +
 .../internal/encoding/DataInputExtended.java       |   58 +
 .../encoding/DataInputExtendedDecorator.java       |  203 +++
 .../internal/encoding/DataInputStreamExtended.java |  206 +++
 .../internal/encoding/DataOutputExtended.java      |   68 +
 .../encoding/DataOutputExtendedDecorator.java      |  206 +++
 .../encoding/DataOutputStreamExtended.java         |  227 +++
 .../internal/encoding/DebugDataInputExtended.java  |  103 ++
 .../internal/encoding/DebugDataOutputExtended.java |  100 ++
 .../core/commons/internal/encoding/Encodable.java  |   40 +
 .../internal/encoding/EncodingConstants.java       |   29 +
 .../internal/encoding/FailedToDecodeException.java |   42 +
 .../encoding/FailedToDeserializeException.java     |   42 +
 .../core/commons/internal/encoding/FieldType.java  | 1361 +++++++++++++++
 .../internal/environment/DeploymentType.java       |   39 +
 .../environment/IsisSystemEnvironment.java         |  203 +++
 .../commons/internal/exceptions/_Exceptions.java   |  407 +++++
 .../commons/internal/exceptions/package-info.java  |   28 +
 .../factory/InstanceCreationClassException.java    |   34 +
 .../factory/InstanceCreationException.java         |   34 +
 .../commons/internal/factory/InstanceUtil.java     |  174 ++
 .../factory/UnavailableClassException.java         |   42 +
 .../commons/internal/factory/package-info.java     |   28 +
 .../commons/internal/functions/_Functions.java     |  204 +++
 .../_Functions_IndexAwareFunctionAdapter.java      |   44 +
 .../commons/internal/functions/_Predicates.java    |   88 +
 .../commons/internal/functions/package-info.java   |   28 +
 .../isis/core/commons/internal/ioc/BeanSort.java   |   96 ++
 .../core/commons/internal/ioc/IocContainer.java    |   69 +
 .../commons/internal/ioc/ManagedBeanAdapter.java   |   34 +
 .../commons/internal/ioc/PriorityConstants.java    |   53 +
 .../commons/internal/ioc/cdi/BeanAdapterCDI.java   |   54 +
 .../core/commons/internal/ioc/cdi/CdiPlugin.java   |   52 +
 .../isis/core/commons/internal/ioc/cdi/_CDI.java   |  243 +++
 .../commons/internal/ioc/cdi/_CDI_Lifecycle.java   |   44 +
 .../internal/ioc/spring/BeanAdapterSpring.java     |   52 +
 .../commons/internal/ioc/spring/EventSpring.java   |   75 +
 .../internal/ioc/spring/IocContainerSpring.java    |  122 ++
 .../core/commons/internal/ioc/spring/_Spring.java  |  228 +++
 .../core/commons/internal/memento/_Mementos.java   |  195 +++
 .../internal/memento/_Mementos_MementoDefault.java |  132 ++
 .../commons/internal/memento/package-info.java     |   28 +
 .../isis/core/commons/internal/package-info.java   |   28 +
 .../internal/plugins/PluginResolveException.java   |   37 +
 .../internal/plugins/codegen/ProxyFactory.java     |   77 +
 .../plugins/codegen/ProxyFactoryService.java       |   34 +
 .../plugins/ioc/ConversationContextHandle.java     |   30 +
 .../plugins/ioc/ConversationContextService.java    |   32 +
 .../ioc/ConversationContextServiceDefault.java     |   38 +
 .../commons/internal/reflection/_Annotations.java  |  230 +++
 .../internal/reflection/_AnnotationsLegacy.java    |  362 ++++
 .../reflection/_Annotations_AttributeMethods.java  |  311 ++++
 .../reflection/_Annotations_SyntCache.java         |   78 +
 ...nthesizedMergedAnnotationInvocationHandler.java |  235 +++
 .../commons/internal/reflection/_MethodCache.java  |  106 ++
 .../core/commons/internal/reflection/_Reflect.java |  435 +++++
 .../commons/internal/reflection/package-info.java  |   28 +
 .../core/commons/internal/resources/_Json.java     |  329 ++++
 .../commons/internal/resources/_Resources.java     |  157 ++
 .../commons/internal/resources/package-info.java   |   28 +
 .../core/commons/internal/url/UrlDecoderUtil.java  |   45 +
 .../handlers/ChainOfResponsibilityTest.java        |  121 --
 .../isis/commons/internal/base/BytesTest.java      |  202 ---
 .../isis/commons/internal/base/NullSafeTest.java   |  116 --
 .../isis/commons/internal/base/ReductionTest.java  |   74 -
 .../isis/commons/internal/base/StringsTest.java    |  306 ----
 .../apache/isis/commons/internal/cdi/CDITest.java  |  127 --
 .../internal/cdi/ValidQualifierForTesting.java     |   35 -
 .../commons/internal/collections/_ArraysTest.java  |   74 -
 .../commons/internal/collections/_MapsTest.java    |  127 --
 .../collections/snapshot/VersionedListTest.java    |   69 -
 .../commons/internal/compare/ComparatorsTest.java  |  157 --
 .../concurrent/ConcurrentTaskListTest.java         |   53 -
 .../isis/commons/internal/context/ContextTest.java |  239 ---
 .../encoding/ByteEncoderDecoderRoundtripTest.java  |  176 --
 .../commons/internal/resources/ResourcesTest.java  |   66 -
 .../isis/commons/internal/strings/FormatTest.java  |   66 -
 .../handlers/ChainOfResponsibilityTest.java        |  121 ++
 .../isis/core/commons/internal/base/BytesTest.java |  202 +++
 .../core/commons/internal/base/NullSafeTest.java   |  116 ++
 .../core/commons/internal/base/ReductionTest.java  |   74 +
 .../core/commons/internal/base/StringsTest.java    |  306 ++++
 .../isis/core/commons/internal/cdi/CDITest.java    |  128 ++
 .../internal/cdi/ValidQualifierForTesting.java     |   35 +
 .../commons/internal/collections/_ArraysTest.java  |   74 +
 .../commons/internal/collections/_MapsTest.java    |  127 ++
 .../collections/snapshot/VersionedListTest.java    |   69 +
 .../commons/internal/compare/ComparatorsTest.java  |  157 ++
 .../concurrent/ConcurrentTaskListTest.java         |   53 +
 .../core/commons/internal/context/ContextTest.java |  239 +++
 .../encoding/ByteEncoderDecoderRoundtripTest.java  |  176 ++
 .../commons/internal/resources/ResourcesTest.java  |   66 +
 .../core/commons/internal/strings/FormatTest.java  |   66 +
 core/config/pom.xml                                |   10 +-
 .../apache/isis/config/ConfigurationConstants.java |   41 -
 .../org/apache/isis/config/IsisConfiguration.java  | 1232 --------------
 .../org/apache/isis/config/IsisModuleConfig.java   |   69 -
 .../apache/isis/config/RestEasyConfiguration.java  |   79 -
 .../IsisBeanFactoryPostProcessorForSpring.java     |  100 --
 .../isis/config/beans/IsisBeanTypeRegistry.java    |  295 ----
 .../config/beans/IsisBeanTypeRegistryHolder.java   |    7 -
 .../config/beans/IsisComponentScanInterceptor.java |   45 -
 .../org/apache/isis/config/beans/TypeMetaData.java |   77 -
 .../isis/config/messages/MessageRegistry.java      |   42 -
 .../facets/AuditObjectsConfiguration.java          |   31 -
 .../facets/CommandActionsConfiguration.java        |   36 -
 .../facets/CommandPropertiesConfiguration.java     |   25 -
 .../metamodel/facets/DefaultViewConfiguration.java |   36 -
 .../facets/EditingObjectsConfiguration.java        |   24 -
 .../facets/PublishActionsConfiguration.java        |   36 -
 .../facets/PublishObjectsConfiguration.java        |   30 -
 .../facets/PublishPropertiesConfiguration.java     |   24 -
 .../apache/isis/config/metamodel/facets/Util.java  |   41 -
 .../ApplicationFeaturesInitConfiguration.java      |   10 -
 .../metamodel/specloader/IntrospectionMode.java    |   67 -
 .../isis/config/presets/DebugMetaModel.properties  |   19 -
 .../presets/DebugProgrammingModel.properties       |   19 -
 .../apache/isis/config/presets/IsisPresets.java    |   79 -
 .../config/presets/SilenceMetaModel.properties     |   19 -
 .../presets/SilenceProgrammingModel.properties     |   19 -
 .../org/apache/isis/config/util/ConfigUtil.java    |   61 -
 .../PatternOptionalStringConstraintValidator.java  |   43 -
 .../isis/config/viewer/wicket/DialogMode.java      |   26 -
 .../config/viewer/wicket/WebAppConfiguration.java  |  124 --
 .../config/viewer/wicket/WebAppContextPath.java    |  100 --
 .../apache/isis/core/config/IsisConfiguration.java | 1233 ++++++++++++++
 .../isis/core/config/IsisModuleCoreConfig.java     |   69 +
 .../isis/core/config/RestEasyConfiguration.java    |   79 +
 .../IsisBeanFactoryPostProcessorForSpring.java     |  100 ++
 .../core/config/beans/IsisBeanTypeRegistry.java    |  295 ++++
 .../config/beans/IsisBeanTypeRegistryHolder.java   |    7 +
 .../config/beans/IsisComponentScanInterceptor.java |   45 +
 .../isis/core/config/beans/TypeMetaData.java       |   77 +
 .../isis/core/config/messages/MessageRegistry.java |   42 +
 .../facets/AuditObjectsConfiguration.java          |   31 +
 .../facets/CommandActionsConfiguration.java        |   36 +
 .../facets/CommandPropertiesConfiguration.java     |   25 +
 .../metamodel/facets/DefaultViewConfiguration.java |   36 +
 .../facets/EditingObjectsConfiguration.java        |   24 +
 .../facets/PublishActionsConfiguration.java        |   36 +
 .../facets/PublishObjectsConfiguration.java        |   30 +
 .../facets/PublishPropertiesConfiguration.java     |   24 +
 .../isis/core/config/metamodel/facets/Util.java    |   41 +
 .../ApplicationFeaturesInitConfiguration.java      |   10 +
 .../metamodel/specloader/IntrospectionMode.java    |   67 +
 .../presets/DataNucleusAutoCreate.properties       |    0
 .../config/presets/DebugDiscovery.properties       |    0
 .../core/config/presets/DebugMetaModel.properties  |   19 +
 .../config/presets/DebugPersistence.properties     |    0
 .../presets/DebugProgrammingModel.properties       |   19 +
 .../config/presets/H2InMemory.properties           |    0
 .../presets/H2InMemory_withUniqueSchema.properties |    0
 .../config/presets/HsqlDbInMemory.properties       |    0
 .../config/presets/IsisIntegTest.properties        |    0
 .../isis/core/config/presets/IsisPresets.java      |   79 +
 .../config/presets/NoTranslations.properties       |    0
 .../config/presets/SilenceMetaModel.properties     |   19 +
 .../presets/SilenceProgrammingModel.properties     |   19 +
 .../config/presets/SilenceWicket.properties        |    0
 .../config/presets/UseLog4j2Test.properties        |    0
 .../apache/isis/core/config/util/ConfigUtil.java   |   65 +
 .../PatternOptionalStringConstraintValidator.java  |   43 +
 .../isis/core/config/viewer/wicket/DialogMode.java |   26 +
 .../config/viewer/wicket/WebAppConfiguration.java  |  124 ++
 .../config/viewer/wicket/WebAppContextPath.java    |  102 ++
 .../services/javax.validation.ConstraintValidator  |    2 +-
 .../config/IsisConfiguration_createSubsetTest.java |  100 --
 ...ion_getMaxTitleLengthInParentedTables_Test.java |   61 -
 ...n_getMaxTitleLengthInStandaloneTables_Test.java |   61 -
 .../isis/config/IsisConfiguration_primingTest.java |   66 -
 .../config/IsisConfiguration_specialCharTest.java  |   52 -
 .../config/IsisConfiguration_whitespaceTest.java   |   73 -
 .../config/util/ConfigUtil_isProtected_Test.java   |   66 -
 .../isis/config/util/ConfigUtil_mask_Test.java     |   49 -
 .../WebAppContextPath_setContextPath_Test.java     |   79 -
 .../config/IsisConfiguration_createSubsetTest.java |  100 ++
 ...ion_getMaxTitleLengthInParentedTables_Test.java |   61 +
 ...n_getMaxTitleLengthInStandaloneTables_Test.java |   61 +
 .../core/config/IsisConfiguration_primingTest.java |   66 +
 .../config/IsisConfiguration_specialCharTest.java  |   52 +
 .../config/IsisConfiguration_whitespaceTest.java   |   73 +
 .../config/util/ConfigUtil_isProtected_Test.java   |   66 +
 .../core/config/util/ConfigUtil_mask_Test.java     |   49 +
 .../WebAppContextPath_setContextPath_Test.java     |   79 +
 core/detached-tests/pom.xml                        |   11 -
 .../commons/internal/reflection/ReflectTest.java   |  143 --
 .../commons/internal/reflection/ReflectTest.java   |  143 ++
 .../facets/object/mixin/MixinIntendedAs.java       |  135 ++
 .../object/mixin/MixinIntendedAsActionTest.java    |  178 ++
 .../facets/param/name/ParameterNameFacetTest.java  |  128 ++
 .../proxy/ProxyCreatorTestUsingCodegenPlugin.java  |   99 ++
 .../facets/object/mixin/MixinIntendedAs.java       |  135 --
 .../object/mixin/MixinIntendedAsActionTest.java    |  178 --
 .../facets/param/name/ParameterNameFacetTest.java  |  128 --
 .../BidirectionalRelationshipContractTestAll.java  |    2 +-
 .../comparable/CategorizedDomainObject.java        |    2 +-
 .../ImposteriserTestUsingCodegenPlugin.java        |    2 +-
 .../proxy/ProxyCreatorTestUsingCodegenPlugin.java  |   99 --
 core/metamodel/log4j2-test.xml                     |    2 +-
 core/metamodel/pom.xml                             |   10 +-
 .../isis/core/metamodel/IsisModuleMetamodel.java   |  101 ++
 .../isis/core/metamodel/adapter/ObjectAdapter.java |   61 +
 .../metamodel/adapter/ObjectAdapterProvider.java   |   35 +
 .../adapter/oid/ObjectNotFoundException.java       |   36 +
 .../adapter/oid/ObjectPersistenceException.java    |   42 +
 .../isis/core/metamodel/adapter/oid/Oid.java       |  140 ++
 .../core/metamodel/adapter/oid/Oid_Marshaller.java |  254 +++
 .../core/metamodel/adapter/oid/Oid_Parented.java   |  146 ++
 .../isis/core/metamodel/adapter/oid/Oid_Root.java  |  167 ++
 .../isis/core/metamodel/adapter/oid/Oid_Value.java |   87 +
 .../core/metamodel/adapter/oid/ParentedOid.java    |   54 +
 .../adapter/oid/PojoRecreationException.java       |   29 +
 .../adapter/oid/PojoRefreshException.java          |   32 +
 .../isis/core/metamodel/adapter/oid/RootOid.java   |   46 +
 .../isis/core/metamodel/adapter/package-info.java  |   32 +
 .../authorization/standard/AuthorizationFacet.java |   32 +
 .../standard/AuthorizationFacetAbstract.java       |   78 +
 .../standard/AuthorizationFacetFactory.java        |   46 +
 .../standard/AuthorizationFacetImpl.java           |   30 +
 .../authorization/standard/package-info.java       |   33 +
 .../core/metamodel/commons/ArrayExtensions.java    |   69 +
 .../isis/core/metamodel/commons/CanBeVoid.java     |   25 +
 .../core/metamodel/commons/ClassExtensions.java    |  175 ++
 .../core/metamodel/commons/ClassFunctions.java     |   46 +
 .../core/metamodel/commons/ClassPredicates.java    |   37 +
 .../isis/core/metamodel/commons/ClassUtil.java     |  192 +++
 .../metamodel/commons/CloseableExtensions.java     |   40 +
 .../core/metamodel/commons/DateExtensions.java     |   35 +
 .../metamodel/commons/InputStreamExtensions.java   |   69 +
 .../core/metamodel/commons/ListExtensions.java     |  115 ++
 .../isis/core/metamodel/commons/LocaleUtil.java    |   40 +
 .../isis/core/metamodel/commons/MapUtil.java       |   48 +
 .../core/metamodel/commons/MethodExtensions.java   |   92 +
 .../commons/MethodInvocationPreprocessor.java      |  154 ++
 .../isis/core/metamodel/commons/MethodUtil.java    |  202 +++
 .../core/metamodel/commons/ObjectExtensions.java   |   82 +
 .../isis/core/metamodel/commons/ResourceUtil.java  |   83 +
 .../core/metamodel/commons/StringExtensions.java   |  393 +++++
 .../metamodel/commons/ThrowableExtensions.java     |   82 +
 .../isis/core/metamodel/commons/ToString.java      |  165 ++
 .../isis/core/metamodel/commons/Wormhole.java      |   50 +
 .../isis/core/metamodel/commons/package-info.java  |   27 +
 .../apache/isis/core/metamodel/consent/Allow.java  |   56 +
 .../isis/core/metamodel/consent/Consent.java       |   73 +
 .../core/metamodel/consent/ConsentAbstract.java    |  159 ++
 .../core/metamodel/consent/InteractionAdvisor.java |  103 ++
 .../metamodel/consent/InteractionContextType.java  |  135 ++
 .../metamodel/consent/InteractionInitiatedBy.java  |   33 +
 .../core/metamodel/consent/InteractionResult.java  |  155 ++
 .../metamodel/consent/InteractionResultSet.java    |  104 ++
 .../apache/isis/core/metamodel/consent/Veto.java   |   48 +
 .../core/metamodel/context/MetaModelContext.java   |  212 +++
 .../metamodel/context/MetaModelContextAware.java   |   29 +
 .../context/MetaModelContext_usingIoc.java         |  172 ++
 .../core/metamodel/context/MetaModelContexts.java  |   44 +
 .../metamodel/exceptions/MetaModelException.java   |   43 +
 .../persistence/ObjectNotFoundException.java       |   38 +
 .../persistence/ObjectPersistenceException.java    |   42 +
 .../persistence/PojoRecreationException.java       |   31 +
 .../persistence/PojoRefreshException.java          |   34 +
 .../apache/isis/core/metamodel/facetapi/Facet.java |  123 ++
 .../core/metamodel/facetapi/FacetAbstract.java     |  287 ++++
 .../isis/core/metamodel/facetapi/FacetHolder.java  |  150 ++
 .../core/metamodel/facetapi/FacetHolderImpl.java   |  168 ++
 .../isis/core/metamodel/facetapi/FacetUtil.java    |   96 ++
 .../metamodel/facetapi/FacetWithAttributes.java    |   32 +
 .../isis/core/metamodel/facetapi/FeatureType.java  |  159 ++
 .../core/metamodel/facetapi/IdentifiedHolder.java  |   31 +
 .../core/metamodel/facetapi/MetaModelRefiner.java  |   34 +
 .../core/metamodel/facetapi/MethodRemover.java     |   71 +
 .../isis/core/metamodel/facets/Annotations.java    |  695 ++++++++
 .../core/metamodel/facets/CollectionUtils.java     |  129 ++
 .../facets/ContributeeMemberFacetFactory.java      |   45 +
 .../core/metamodel/facets/DependentArgUtils.java   |  198 +++
 .../core/metamodel/facets/DomainEventHelper.java   |  441 +++++
 .../isis/core/metamodel/facets/FacetFactory.java   |  337 ++++
 .../metamodel/facets/FacetFactoryAbstract.java     |   70 +
 .../isis/core/metamodel/facets/FacetedMethod.java  |  216 +++
 .../metamodel/facets/FacetedMethodParameter.java   |   50 +
 .../core/metamodel/facets/ImperativeFacet.java     |  169 ++
 .../metamodel/facets/ImperativeFacetMulti.java     |   33 +
 .../facets/MethodFilteringFacetFactory.java        |   33 +
 .../core/metamodel/facets/MethodFinderUtils.java   |  239 +++
 .../metamodel/facets/MethodLiteralConstants.java   |   77 +
 .../facets/MethodPrefixBasedFacetFactory.java      |   39 +
 .../MethodPrefixBasedFacetFactoryAbstract.java     |  138 ++
 .../metamodel/facets/MethodRemoverConstants.java   |   44 +
 .../core/metamodel/facets/MultipleValueFacet.java  |   26 +
 .../metamodel/facets/ObjectSpecIdFacetFactory.java |   37 +
 .../facets/OrphanedSupportingMethodValidator.java  |  126 ++
 .../metamodel/facets/PostConstructMethodCache.java |   30 +
 ...ropertyOrCollectionIdentifyingFacetFactory.java |   83 +
 ...rCollectionIdentifyingFacetFactoryAbstract.java |   43 +
 .../metamodel/facets/SingleClassValueFacet.java    |   35 +
 .../facets/SingleClassValueFacetAbstract.java      |   60 +
 .../core/metamodel/facets/SingleIntValueFacet.java |   27 +
 .../facets/SingleIntValueFacetAbstract.java        |   47 +
 .../metamodel/facets/SingleStringValueFacet.java   |   23 +
 .../facets/SingleStringValueFacetAbstract.java     |   58 +
 .../core/metamodel/facets/SingleValueFacet.java    |   28 +
 .../metamodel/facets/SingleValueFacetAbstract.java |   46 +
 .../isis/core/metamodel/facets/TypedHolder.java    |   55 +
 .../core/metamodel/facets/TypedHolderDefault.java  |   58 +
 .../core/metamodel/facets/WhereValueFacet.java     |   29 +
 .../metamodel/facets/WhereValueFacetAbstract.java  |   57 +
 ...lementSpecificationProviderFromTypeOfFacet.java |   37 +
 .../facets/actcoll/typeof/TypeOfFacet.java         |  126 ++
 .../facets/actcoll/typeof/TypeOfFacetAbstract.java |   40 +
 .../actcoll/typeof/TypeOfFacetDefaultToObject.java |   30 +
 .../typeof/TypeOfFacetInferredFromArray.java       |   30 +
 .../typeof/TypeOfFacetInferredFromGenerics.java    |   30 +
 .../action/ActionAnnotationFacetFactory.java       |  287 ++++
 ...nChoicesForCollectionParameterFacetFactory.java |  161 ++
 .../action/associateWith/AssociatedWithFacet.java  |   30 +
 .../associateWith/AssociatedWithFacetAbstract.java |   45 +
 .../AssociatedWithFacetForActionAnnotation.java    |   32 +
 .../command/CommandFacetForActionAnnotation.java   |  123 ++
 ...ommandFacetForActionAnnotationAsConfigured.java |   39 +
 .../command/CommandFacetFromConfiguration.java     |   46 +
 .../hidden/HiddenFacetForActionAnnotation.java     |   56 +
 .../action/invocation/ActionDomainEventFacet.java  |   33 +
 .../invocation/ActionDomainEventFacetAbstract.java |  165 ++
 .../invocation/ActionDomainEventFacetDefault.java  |   33 +
 .../ActionDomainEventFacetForActionAnnotation.java |   32 +
 .../action/invocation/ActionInvocationFacet.java   |   51 +
 .../invocation/ActionInvocationFacetAbstract.java  |   38 +
 ...ctionInvocationFacetForDomainEventAbstract.java |  513 ++++++
 ...ionFacetForDomainEventFromActionAnnotation.java |   40 +
 ...onInvocationFacetForDomainEventFromDefault.java |   40 +
 .../actions/action/invocation/CommandUtil.java     |  113 ++
 .../PrototypeFacetForActionAnnotation.java         |   51 +
 .../PublishedActionFacetForActionAnnotation.java   |   99 ++
 ...ActionFacetForActionAnnotationAsConfigured.java |   31 +
 .../PublishedActionFacetFromConfiguration.java     |   32 +
 ...ctionSemanticsFacetFallbackToNonIdempotent.java |   32 +
 .../ActionSemanticsFacetForActionAnnotation.java   |   49 +
 .../typeof/TypeOfFacetForActionAnnotation.java     |   33 +
 .../facets/actions/command/CommandFacet.java       |   55 +
 .../actions/command/CommandFacetAbstract.java      |  123 ++
 .../actions/defaults/ActionDefaultsFacet.java      |   35 +
 .../defaults/ActionDefaultsFacetAbstract.java      |   36 +
 .../method/ActionDefaultsFacetViaMethod.java       |   88 +
 .../ActionDefaultsFacetViaMethodFactory.java       |   88 +
 .../FileAcceptFacetForActionAnnotation.java        |   47 +
 .../facets/actions/homepage/HomePageFacet.java     |   34 +
 .../actions/homepage/HomePageFacetAbstract.java    |   36 +
 .../facets/actions/homepage/HomePageFacetImpl.java |   30 +
 .../annotation/HomePageFacetAnnotation.java        |   31 +
 .../annotation/HomePageFacetAnnotationFactory.java |  130 ++
 .../actions/layout/ActionLayoutFacetFactory.java   |  171 ++
 ...tionPositionFacetForActionLayoutAnnotation.java |   46 +
 .../layout/ActionPositionFacetForActionXml.java    |   41 +
 ...okmarkPolicyFacetForActionLayoutAnnotation.java |   58 +
 .../layout/BookmarkPolicyFacetForActionXml.java    |   42 +
 .../CssClassFaFacetForActionLayoutAnnotation.java  |   57 +
 .../layout/CssClassFaFacetForActionXml.java        |   44 +
 .../CssClassFacetForActionLayoutAnnotation.java    |   47 +
 .../actions/layout/CssClassFacetForActionXml.java  |   42 +
 .../DescribedAsFacetForActionLayoutAnnotation.java |   47 +
 .../layout/DescribedAsFacetForActionXml.java       |   42 +
 .../HiddenFacetForActionLayoutAnnotation.java      |   56 +
 .../actions/layout/HiddenFacetForActionXml.java    |   51 +
 .../NamedFacetForActionLayoutAnnotation.java       |   48 +
 .../actions/layout/NamedFacetForActionXml.java     |   44 +
 ...tContributedFacetForActionLayoutAnnotation.java |   52 +
 .../PromptStyleFacetForActionLayoutAnnotation.java |   97 ++
 .../layout/PromptStyleFacetForActionXml.java       |   57 +
 .../RedirectFacetFromActionLayoutAnnotation.java   |   47 +
 .../actions/layout/RedirectFacetFromActionXml.java |   43 +
 .../notcontributed/NotContributedFacet.java        |   40 +
 .../NotContributedFacetAbstract.java               |   73 +
 ...tributedFacetDerivedFromDomainServiceFacet.java |   47 +
 ...dFacetDerivedFromDomainServiceFacetFactory.java |   58 +
 .../NotContributedFacetDerivedFromMixinFacet.java  |   37 +
 ...ntributedFacetDerivedFromMixinFacetFactory.java |   52 +
 .../notinservicemenu/NotInServiceMenuFacet.java    |   38 +
 .../NotInServiceMenuFacetAbstract.java             |   40 +
 ...viceMenuFacetDerivedFromDomainServiceFacet.java |   54 +
 ...uFacetDerivedFromDomainServiceFacetFactory.java |   59 +
 .../actions/position/ActionPositionFacet.java      |   44 +
 .../position/ActionPositionFacetAbstract.java      |   57 +
 .../position/ActionPositionFacetFallback.java      |   31 +
 .../facets/actions/prototype/PrototypeFacet.java   |   30 +
 .../actions/prototype/PrototypeFacetAbstract.java  |   56 +
 .../actions/publish/PublishedActionFacet.java      |   30 +
 .../publish/PublishedActionFacetAbstract.java      |   38 +
 .../facets/actions/redirect/RedirectFacet.java     |   33 +
 .../actions/redirect/RedirectFacetAbstract.java    |   66 +
 .../actions/redirect/RedirectFacetFallback.java    |   31 +
 .../actions/semantics/ActionSemanticsFacet.java    |   33 +
 .../semantics/ActionSemanticsFacetAbstract.java    |   39 +
 .../validate/ActionParameterValidationFacet.java   |   46 +
 .../ActionParameterValidationFacetAbstract.java    |   47 +
 .../actions/validate/ActionValidationFacet.java    |   49 +
 .../validate/ActionValidationFacetAbstract.java    |   47 +
 .../ActionParameterValidationFacetViaMethod.java   |   84 +
 .../method/ActionValidationFacetViaMethod.java     |   84 +
 .../ActionValidationFacetViaMethodFactory.java     |  117 ++
 .../facets/all/deficiencies/DeficiencyFacet.java   |  134 ++
 .../facets/all/describedas/DescribedAsFacet.java   |   33 +
 .../all/describedas/DescribedAsFacetAbstract.java  |   36 +
 .../core/metamodel/facets/all/help/HelpFacet.java  |   29 +
 .../facets/all/help/HelpFacetAbstract.java         |   36 +
 .../metamodel/facets/all/hide/HiddenFacet.java     |   31 +
 .../all/i18n/DescribedAsFacetTranslated.java       |   64 +
 .../facets/all/i18n/NamedFacetTranslated.java      |   72 +
 .../facets/all/i18n/PluralFacetTranslated.java     |   55 +
 .../facets/all/i18n/TranslationFacetFactory.java   |  119 ++
 .../metamodel/facets/all/named/NamedFacet.java     |   42 +
 .../facets/all/named/NamedFacetAbstract.java       |   59 +
 .../facets/all/named/NamedFacetInferred.java       |   31 +
 .../collections/CollectionFacetAbstract.java       |   40 +
 .../CollectionAccessorFacetViaAccessor.java        |  109 ++
 .../CollectionAccessorFacetViaAccessorFactory.java |  112 ++
 .../clear/CollectionClearFacetFactory.java         |   70 +
 .../clear/CollectionClearFacetViaAccessor.java     |   79 +
 .../clear/CollectionClearFacetViaClearMethod.java  |   70 +
 .../CollectionAnnotationFacetFactory.java          |  293 ++++
 .../collection/defaultview/DefaultViewFacet.java   |   26 +
 .../defaultview/DefaultViewFacetAbstract.java      |   35 +
 .../DisabledFacetForCollectionAnnotation.java      |   69 +
 .../hidden/HiddenFacetForCollectionAnnotation.java |   56 +
 ...ectionAddToFacetForDomainEventFromAbstract.java |  124 ++
 ...acetForDomainEventFromCollectionAnnotation.java |   43 +
 ...lectionAddToFacetForDomainEventFromDefault.java |   41 +
 .../modify/CollectionDomainEventFacet.java         |   34 +
 .../modify/CollectionDomainEventFacetAbstract.java |  145 ++
 .../modify/CollectionDomainEventFacetDefault.java  |   32 +
 ...ionDomainEventFacetForCollectionAnnotation.java |   45 +
 ...nRemoveFromFacetForDomainEventFromAbstract.java |  123 ++
 ...acetForDomainEventFromCollectionAnnotation.java |   43 +
 ...onRemoveFromFacetForDomainEventFromDefault.java |   41 +
 .../NotPersistedFacetForCollectionAnnotation.java  |   55 +
 ...fFacetOnCollectionFromCollectionAnnotation.java |   47 +
 ...abledFacetOnCollectionDerivedFromImmutable.java |   39 +
 ...cetOnCollectionDerivedFromImmutableFactory.java |   45 +
 .../javautilcollection/CollectionFacetFactory.java |   86 +
 .../javautilcollection/JavaArrayFacet.java         |   84 +
 .../javautilcollection/JavaCollectionFacet.java    |   78 +
 .../layout/CollectionLayoutFacetFactory.java       |  123 ++
 ...CssClassFacetForCollectionLayoutAnnotation.java |   45 +
 .../layout/CssClassFacetForCollectionXml.java      |   42 +
 ...aultViewFacetForCollectionLayoutAnnotation.java |   48 +
 .../layout/DefaultViewFacetForCollectionXml.java   |   42 +
 ...cribedAsFacetForCollectionLayoutAnnotation.java |   45 +
 .../layout/DescribedAsFacetForCollectionXml.java   |   42 +
 .../HiddenFacetForCollectionLayoutAnnotation.java  |   58 +
 .../layout/HiddenFacetForCollectionXml.java        |   51 +
 .../NamedFacetForCollectionLayoutAnnotation.java   |   52 +
 .../layout/NamedFacetForCollectionXml.java         |   47 +
 .../PagedFacetForCollectionLayoutAnnotation.java   |   46 +
 .../layout/PagedFacetForCollectionXml.java         |   41 +
 ...SortedByFacetForCollectionLayoutAnnotation.java |   53 +
 .../layout/SortedByFacetForCollectionXml.java      |   56 +
 .../collections/modify/CollectionAddToFacet.java   |   37 +
 .../modify/CollectionAddToFacetAbstract.java       |   36 +
 .../modify/CollectionAddToFacetViaAccessor.java    |   77 +
 .../modify/CollectionAddToFacetViaMethod.java      |   74 +
 ...tionAddToRemoveFromAndValidateFacetFactory.java |  177 ++
 .../collections/modify/CollectionClearFacet.java   |   36 +
 .../modify/CollectionClearFacetAbstract.java       |   36 +
 .../facets/collections/modify/CollectionFacet.java |  112 ++
 .../modify/CollectionRemoveFromFacet.java          |   39 +
 .../modify/CollectionRemoveFromFacetAbstract.java  |   36 +
 .../CollectionRemoveFromFacetViaAccessor.java      |   80 +
 .../modify/CollectionRemoveFromFacetViaMethod.java |   74 +
 .../TypeOfFacetInferredFromSupportingMethods.java  |   31 +
 .../parented/ParentedCollectionFacetDefault.java   |   37 +
 .../ParentedFacetSinceCollectionFactory.java       |   53 +
 .../facets/collections/sortedby/SortedByFacet.java |   32 +
 .../sortedby/SortedByFacetAbstract.java            |   38 +
 .../annotation/SortedByFacetAnnotationFactory.java |   90 +
 .../validate/CollectionValidateAddToFacet.java     |   40 +
 .../CollectionValidateAddToFacetAbstract.java      |   48 +
 .../CollectionValidateAddToFacetViaMethod.java     |   82 +
 .../CollectionValidateRemoveFromFacet.java         |   39 +
 .../CollectionValidateRemoveFromFacetAbstract.java |   47 +
 ...CollectionValidateRemoveFromFacetViaMethod.java |   83 +
 .../collparam/semantics/CollectionSemantics.java   |  125 ++
 .../semantics/CollectionSemanticsFacet.java        |   29 +
 .../semantics/CollectionSemanticsFacetDefault.java |   47 +
 .../facets/fallback/ActionChoicesFacetNone.java    |   45 +
 .../facets/fallback/ActionDefaultsFacetNone.java   |   42 +
 .../facets/fallback/DescribedAsFacetNone.java      |   39 +
 .../facets/fallback/FallbackFacetFactory.java      |  144 ++
 .../metamodel/facets/fallback/HelpFacetNone.java   |   44 +
 .../LabelAtFacetFromLayoutConfiguration.java       |   30 +
 .../facets/fallback/MaxLengthFacetUnlimited.java   |   46 +
 .../facets/fallback/MultiLineFacetNone.java        |   36 +
 .../facets/fallback/NamedFacetDefault.java         |   33 +
 .../metamodel/facets/fallback/NamedFacetNone.java  |   44 +
 .../fallback/PagedFacetFromConfiguration.java      |   29 +
 .../metamodel/facets/fallback/TitleFacetNone.java  |   42 +
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  399 +++++
 .../facets/jaxb/XmlAccessorTypeFacet.java          |   31 +
 .../facets/jaxb/XmlAccessorTypeFacetAbstract.java  |   40 +
 .../facets/jaxb/XmlAccessorTypeFacetDefault.java   |   33 +
 .../facets/jaxb/XmlJavaTypeAdapterFacet.java       |   29 +
 .../jaxb/XmlJavaTypeAdapterFacetAbstract.java      |   38 +
 .../jaxb/XmlJavaTypeAdapterFacetDefault.java       |   31 +
 .../metamodel/facets/jaxb/XmlTransientFacet.java   |   29 +
 .../facets/jaxb/XmlTransientFacetAbstract.java     |   37 +
 .../facets/jaxb/XmlTransientFacetDefault.java      |   30 +
 .../facets/members/cssclass/CssClassFacet.java     |   38 +
 .../members/cssclass/CssClassFacetAbstract.java    |   51 +
 .../members/cssclass/CssClassFacetAbstract2.java   |   36 +
 .../CssClassFacetOnActionFromConfiguredRegex.java  |   30 +
 ...assFacetOnActionFromConfiguredRegexFactory.java |  120 ++
 .../facets/members/cssclassfa/CssClassFaFacet.java |   37 +
 .../cssclassfa/CssClassFaFacetAbstract.java        |   79 +
 .../members/cssclassfa/CssClassFaPosition.java     |  104 ++
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |  103 ++
 ...CssClassFaFacetOnMemberFromConfiguredRegex.java |   31 +
 .../CssClassFaFacetOnMemberFromProperties.java     |   40 +
 .../cssclassfa/annotprop/MixinInterceptor.java     |   64 +
 .../DescribedAsFacetOnMemberDerivedFromType.java   |   32 +
 .../annotprop/DescribedAsFacetOnMemberFactory.java |   64 +
 .../DescribedAsFacetOnMemberFromProperties.java    |   37 +
 .../facets/members/disabled/DisabledFacet.java     |   54 +
 .../members/disabled/DisabledFacetAbstract.java    |  102 ++
 .../DisabledFacetAbstractAlwaysEverywhere.java     |   40 +
 .../disabled/DisabledFacetAbstractImpl.java        |   83 +
 .../disabled/DisabledFacetForContributee.java      |   30 +
 .../disabled/method/DisableForContextFacet.java    |   37 +
 .../method/DisableForContextFacetAbstract.java     |   37 +
 .../method/DisableForContextFacetNone.java         |   49 +
 .../method/DisableForContextFacetViaMethod.java    |  100 ++
 .../DisableForContextFacetViaMethodFactory.java    |   94 +
 .../facets/members/hidden/HiddenFacetAbstract.java |   86 +
 .../HiddenFacetAbstractAlwaysEverywhere.java       |   50 +
 .../members/hidden/HiddenFacetAbstractImpl.java    |   52 +
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   53 +
 .../members/hidden/method/HideForContextFacet.java |   37 +
 .../hidden/method/HideForContextFacetAbstract.java |   37 +
 .../hidden/method/HideForContextFacetNone.java     |   45 +
 .../method/HideForContextFacetViaMethod.java       |   78 +
 .../HideForContextFacetViaMethodFactory.java       |   82 +
 .../facets/members/order/MemberOrderFacet.java     |   59 +
 .../members/order/MemberOrderFacetAbstract.java    |  107 ++
 .../annotprop/MemberOrderFacetAnnotation.java      |   35 +
 .../order/annotprop/MemberOrderFacetFactory.java   |   69 +
 .../MemberOrderFacetForActionAnnotation.java       |   34 +
 .../annotprop/MemberOrderFacetProperties.java      |   49 +
 .../order/annotprop/MemberOrderFacetXml.java       |   35 +
 .../ViewModelSemanticCheckingFacetFactory.java     |  209 +++
 .../facets/object/audit/AuditableFacet.java        |   40 +
 .../object/audit/AuditableFacetAbstract.java       |   61 +
 .../facets/object/audit/AuditableFacetImpl.java    |   30 +
 .../object/autocomplete/AutoCompleteFacet.java     |   35 +
 .../autocomplete/AutoCompleteFacetAbstract.java    |  126 ++
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |   31 +
 .../BookmarkPolicyFacetAbstract.java               |   59 +
 .../BookmarkPolicyFacetFallback.java               |   32 +
 .../BookmarkPolicyFacetFallbackFactory.java        |   88 +
 .../facets/object/callbacks/CallbackFacet.java     |   53 +
 .../object/callbacks/CallbackFacetAbstract.java    |   35 +
 .../object/callbacks/CreatedCallbackFacet.java     |   36 +
 .../callbacks/CreatedCallbackFacetAbstract.java    |   35 +
 .../callbacks/CreatedCallbackFacetFactory.java     |   51 +
 .../callbacks/CreatedCallbackFacetViaMethod.java   |   70 +
 .../callbacks/CreatedLifecycleEventFacet.java      |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   46 +
 .../object/callbacks/LifecycleEventFacet.java      |   28 +
 .../object/callbacks/LoadCallbackFacetFactory.java |   63 +
 .../object/callbacks/LoadedCallbackFacet.java      |   37 +
 .../callbacks/LoadedCallbackFacetAbstract.java     |   35 +
 .../callbacks/LoadedCallbackFacetViaMethod.java    |   71 +
 .../callbacks/LoadedLifecycleEventFacet.java       |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 +
 .../object/callbacks/LoadingCallbackFacet.java     |   28 +
 .../callbacks/LoadingCallbackFacetAbstract.java    |   39 +
 .../callbacks/LoadingCallbackFacetViaMethod.java   |   75 +
 .../callbacks/PersistCallbackFacetFactory.java     |   78 +
 .../PersistCallbackViaSaveMethodFacetFactory.java  |   78 +
 .../object/callbacks/PersistedCallbackFacet.java   |   36 +
 .../callbacks/PersistedCallbackFacetAbstract.java  |   35 +
 .../callbacks/PersistedCallbackFacetViaMethod.java |   71 +
 .../callbacks/PersistedLifecycleEventFacet.java    |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 +
 .../object/callbacks/PersistingCallbackFacet.java  |   37 +
 .../callbacks/PersistingCallbackFacetAbstract.java |   35 +
 .../PersistingCallbackFacetViaMethod.java          |   71 +
 .../callbacks/PersistingLifecycleEventFacet.java   |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../callbacks/RemoveCallbackFacetFactory.java      |   79 +
 .../RemoveCallbackViaDeleteMethodFacetFactory.java |   79 +
 .../object/callbacks/RemovedCallbackFacet.java     |   35 +
 .../callbacks/RemovedCallbackFacetAbstract.java    |   39 +
 .../callbacks/RemovedCallbackFacetViaMethod.java   |   75 +
 .../object/callbacks/RemovingCallbackFacet.java    |   34 +
 .../callbacks/RemovingCallbackFacetAbstract.java   |   35 +
 .../callbacks/RemovingCallbackFacetViaMethod.java  |   71 +
 .../callbacks/RemovingLifecycleEventFacet.java     |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../callbacks/UpdateCallbackFacetFactory.java      |   68 +
 .../object/callbacks/UpdatedCallbackFacet.java     |   37 +
 .../callbacks/UpdatedCallbackFacetAbstract.java    |   35 +
 .../callbacks/UpdatedCallbackFacetViaMethod.java   |   71 +
 .../callbacks/UpdatedLifecycleEventFacet.java      |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../object/callbacks/UpdatingCallbackFacet.java    |   37 +
 .../callbacks/UpdatingCallbackFacetAbstract.java   |   35 +
 .../callbacks/UpdatingCallbackFacetViaMethod.java  |   71 +
 .../callbacks/UpdatingLifecycleEventFacet.java     |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../choices/ChoicesFacetFromBoundedAbstract.java   |  119 ++
 .../facets/object/choices/ChoicesFacetUtils.java   |   42 +
 .../facets/object/choices/QueryFindAllChoices.java |   57 +
 .../object/choices/enums/ChoicesFacetEnum.java     |   49 +
 .../facets/object/choices/enums/EnumFacet.java     |   26 +
 ...ingValueFacetUsingSemanticsProviderFactory.java |   49 +
 .../choices/enums/EnumValueSemanticsProvider.java  |  152 ++
 .../cssclass/method/CssClassFacetMethod.java       |   61 +
 .../method/CssClassFacetMethodFactory.java         |   52 +
 ...ssClassFaFacetForDomainObjectLayoutFactory.java |   43 +
 .../CssClassFaFacetForViewModelLayoutFactory.java  |   45 +
 .../facets/object/defaults/DefaultedFacet.java     |   47 +
 .../object/defaults/DefaultedFacetAbstract.java    |   84 +
 .../DefaultedFacetUsingDefaultsProvider.java       |   47 +
 .../object/defaults/DefaultsProviderUtil.java      |   75 +
 .../annotcfg/DefaultedFacetAnnotation.java         |   62 +
 ...tedFacetAnnotationElseConfigurationFactory.java |   71 +
 .../annotcfg/DefaultedFacetFromConfiguration.java  |   31 +
 .../object/disabled/DisabledObjectFacet.java       |   54 +
 .../disabled/DisabledObjectFacetAbstract.java      |   52 +
 .../method/DisabledObjectFacetViaMethod.java       |   93 +
 .../DisabledObjectFacetViaMethodFactory.java       |   88 +
 .../DomainObjectAnnotationFacetFactory.java        |  570 +++++++
 .../AuditableFacetForDomainObjectAnnotation.java   |   74 +
 ...FacetForDomainObjectAnnotationAsConfigured.java |   31 +
 .../auditing/AuditableFacetFromConfiguration.java  |   36 +
 ...AutoCompleteFacetForDomainObjectAnnotation.java |   46 +
 .../ChoicesFacetForDomainObjectAnnotation.java     |   49 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   52 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 +
 .../ImmutableFacetForDomainObjectAnnotation.java   |  101 ++
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 +
 .../editing/ImmutableFacetFromConfiguration.java   |   58 +
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |   47 +
 ...lishedObjectFacetForDomainObjectAnnotation.java |   67 +
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 +
 .../PublishedObjectFacetFromConfiguration.java     |   31 +
 ...atableObjectFacetForDomainObjectAnnotation.java |   73 +
 ...PolicyFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../BookmarkPolicyFacetForDomainObjectXml.java     |   42 +
 ...arkPolicyFacetForViewModelLayoutAnnotation.java |   47 +
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |   55 +
 .../CssClassFaFacetForDomainObjectXml.java         |   44 +
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |   54 +
 ...sClassFacetForDomainObjectLayoutAnnotation.java |   57 +
 .../CssClassFacetForDomainObjectXml.java           |   42 +
 .../CssClassFacetForViewModelLayoutAnnotation.java |   45 +
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  121 ++
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  118 ++
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../DescribedAsFacetForDomainObjectXml.java        |   42 +
 ...scribedAsFacetForViewModelLayoutAnnotation.java |   47 +
 .../DomainObjectLayoutFacetFactory.java            |  113 ++
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  117 ++
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  118 ++
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |  118 ++
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |  117 ++
 .../NamedFacetForDomainObjectLayoutAnnotation.java |   47 +
 .../NamedFacetForDomainObjectXml.java              |   44 +
 .../NamedFacetForViewModelLayoutAnnotation.java    |   45 +
 .../PagedFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../PagedFacetForViewModelLayoutAnnotation.java    |   46 +
 ...PluralFacetForDomainObjectLayoutAnnotation.java |   47 +
 .../PluralFacetForDomainObjectXml.java             |   40 +
 .../PluralFacetForViewModelLayoutAnnotation.java   |   47 +
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  135 ++
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  135 ++
 .../object/domainservice/DomainServiceFacet.java   |   54 +
 .../domainservice/DomainServiceFacetAbstract.java  |   65 +
 .../annotation/DomainServiceFacetAnnotation.java   |   35 +
 .../DomainServiceFacetAnnotationFactory.java       |  153 ++
 ...conFacetDerivedFromDomainServiceAnnotation.java |   47 +
 .../DomainServiceLayoutFacet.java                  |   36 +
 .../DomainServiceLayoutFacetAbstract.java          |   54 +
 .../DomainServiceLayoutFacetFactory.java           |   70 +
 ...NamedFacetForDomainServiceLayoutAnnotation.java |   36 +
 .../DomainServiceLayoutFacetAnnotation.java        |   34 +
 .../facets/object/encodeable/EncodableFacet.java   |   42 +
 .../object/encodeable/EncodableFacetAbstract.java  |   85 +
 .../object/encodeable/EncoderDecoderUtil.java      |   36 +
 .../annotcfg/EncodableFacetFromConfiguration.java  |   33 +
 .../encoder/EncodableFacetUsingEncoderDecoder.java |   75 +
 .../facets/object/entity/EntityFacet.java          |   54 +
 .../facets/object/facets/FacetsFacet.java          |   48 +
 .../facets/object/facets/FacetsFacetAbstract.java  |   94 +
 .../facets/annotation/FacetsFacetAnnotation.java   |   32 +
 .../annotation/FacetsFacetAnnotationFactory.java   |   54 +
 .../metamodel/facets/object/grid/GridFacet.java    |   41 +
 .../facets/object/grid/GridFacetDefault.java       |   84 +
 .../facets/object/grid/GridFacetFactory.java       |   46 +
 .../facets/object/hidden/HiddenObjectFacet.java    |   56 +
 .../object/hidden/HiddenObjectFacetAbstract.java   |   50 +
 .../hidden/method/HiddenObjectFacetViaMethod.java  |   65 +
 .../method/HiddenObjectFacetViaMethodFactory.java  |   91 +
 .../metamodel/facets/object/icon/IconFacet.java    |   44 +
 .../facets/object/icon/IconFacetAbstract.java      |   36 +
 .../facets/object/icon/method/IconFacetMethod.java |   52 +
 .../object/icon/method/IconFacetMethodFactory.java |   53 +
 .../RemoveAnnotatedMethodsFacetFactory.java        |   99 ++
 ...oveDatanucleusPersistableTypesFacetFactory.java |   67 +
 .../RemoveDnPrefixedMethodsFacetFactory.java       |   46 +
 .../javalang/IteratorFilteringFacetFactory.java    |   55 +
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  132 ++
 .../jdo/RemoveJdoEnhancementTypesFacetFactory.java |   66 +
 .../jdo/RemoveJdoPrefixedMethodsFacetFactory.java  |   48 +
 .../facets/object/immutable/ImmutableFacet.java    |   69 +
 .../object/immutable/ImmutableFacetAbstract.java   |   61 +
 .../CopyImmutableFacetOntoMembersFactory.java      |   45 +
 .../facets/object/layout/LayoutFacet.java          |   37 +
 .../facets/object/layout/LayoutFacetAbstract.java  |   41 +
 .../facets/object/layout/LayoutFacetFactory.java   |   56 +
 .../facets/object/layout/LayoutFacetFallback.java  |   44 +
 .../facets/object/layout/LayoutFacetMethod.java    |   54 +
 .../mixin/MetaModelValidatorForMixinTypes.java     |   55 +
 .../metamodel/facets/object/mixin/MixinFacet.java  |   74 +
 .../facets/object/mixin/MixinFacetAbstract.java    |  143 ++
 .../mixin/MixinFacetForDomainObjectAnnotation.java |   72 +
 .../object/mixin/MixinFacetForMixinAnnotation.java |   64 +
 .../mixin/MixinFacetForMixinAnnotationFactory.java |   64 +
 .../object/navparent/NavigableParentFacet.java     |   43 +
 .../navparent/NavigableParentFacetAbstract.java    |   36 +
 .../NavigableParentAnnotationFacetFactory.java     |  161 ++
 .../method/NavigableParentFacetMethod.java         |   60 +
 .../object/objectspecid/ObjectSpecIdFacet.java     |   33 +
 .../objectspecid/ObjectSpecIdFacetAbstract.java    |   66 +
 .../ObjectSpecIdFacetDerivedFromClassName.java     |   35 +
 ...jectSpecIdFacetDerivedFromClassNameFactory.java |  205 +++
 ...ectSpecIdFacetDerivedFromIoCNamingStrategy.java |   34 +
 .../ObjectSpecIdFacetOnStandaloneList.java         |   31 +
 .../ObjectValidPropertiesFacet.java                |   42 +
 .../ObjectValidPropertiesFacetAbstract.java        |   48 +
 .../impl/ObjectValidPropertiesFacetImpl.java       |   70 +
 .../ObjectValidPropertiesFacetImplFactory.java     |   35 +
 .../metamodel/facets/object/paged/PagedFacet.java  |   31 +
 .../facets/object/paged/PagedFacetAbstract.java    |   50 +
 .../PagedFacetForPagedAnnotationOnType.java        |   34 +
 .../object/parented/ParentedCollectionFacet.java   |   40 +
 .../parented/ParentedCollectionFacetAbstract.java  |   36 +
 .../object/parseable/InvalidEntryException.java    |   42 +
 .../facets/object/parseable/ParseableFacet.java    |   55 +
 .../object/parseable/ParseableFacetAbstract.java   |   90 +
 .../facets/object/parseable/ParserUtil.java        |   46 +
 .../object/parseable/TextEntryParseException.java  |   47 +
 .../annotcfg/ParseableFacetFromConfiguration.java  |   33 +
 .../parser/ParseableFacetUsingParser.java          |  132 ++
 .../facets/object/plural/PluralFacet.java          |   41 +
 .../facets/object/plural/PluralFacetAbstract.java  |   42 +
 .../plural/inferred/PluralFacetInferred.java       |   31 +
 .../facets/object/projection/ProjectionFacet.java  |   29 +
 .../object/projection/ProjectionFacetAbstract.java |   42 +
 .../ProjectionFacetFromProjectingProperty.java     |   65 +
 .../CssClassFacetDerivedFromProjectionFacet.java   |   54 +
 .../ident/IconFacetDerivedFromProjectionFacet.java |   52 +
 .../TitleFacetDerivedFromProjectionFacet.java      |   52 +
 .../object/promptStyle/PromptStyleFacet.java       |   33 +
 .../promptStyle/PromptStyleFacetAbstract.java      |   42 +
 .../promptStyle/PromptStyleFacetAsConfigured.java  |   45 +
 .../PromptStyleFacetFallBackToInline.java          |   37 +
 .../publishedobject/PublishedObjectFacet.java      |   30 +
 .../PublishedObjectFacetAbstract.java              |   38 +
 ...etOnCollectionDerivedFromRecreatableObject.java |   46 +
 ...CollectionDerivedFromViewModelFacetFactory.java |   54 +
 ...acetOnPropertyDerivedFromRecreatableObject.java |   48 +
 ...tyDerivedFromRecreatableObjectFacetFactory.java |   52 +
 .../RecreatableObjectFacetAbstract.java            |  129 ++
 ...ObjectFacetDeclarativeInitializingAbstract.java |  145 ++
 .../recreatable/RecreatableObjectFacetFactory.java |  131 ++
 ...ctFacetForRecreatableDomainObjectInterface.java |   46 +
 ...eObjectFacetForRecreatableObjectAnnotation.java |   34 +
 ...leObjectFacetForRecreatableObjectInterface.java |   45 +
 ...creatableObjectFacetForViewModelAnnotation.java |   35 +
 ...ableObjectFacetForXmlRootElementAnnotation.java |   81 +
 .../metamodel/facets/object/recreatable/Util.java  |   33 +
 .../metamodel/facets/object/title/TitleFacet.java  |   55 +
 .../facets/object/title/TitleFacetAbstract.java    |   45 +
 .../annotation/TitleAnnotationFacetFactory.java    |  188 ++
 .../annotation/TitleFacetViaTitleAnnotation.java   |  169 ++
 .../title/methods/TitleFacetViaMethodsFactory.java |   95 ++
 .../title/methods/TitleFacetViaTitleMethod.java    |   93 +
 .../title/methods/TitleFacetViaToStringMethod.java |   70 +
 .../object/title/parser/TitleFacetUsingParser.java |   79 +
 .../validateobject/ValidateObjectFacet.java        |   55 +
 .../ValidateObjectFacetAbstract.java               |   49 +
 .../method/ValidateObjectFacetMethod.java          |   80 +
 .../method/ValidateObjectFacetMethodFactory.java   |   60 +
 .../facets/object/value/EqualByContentFacet.java   |   33 +
 .../object/value/EqualByContentFacetAbstract.java  |   36 +
 .../EqualByContentFacetViaValueSemantics.java      |   30 +
 .../value/ImmutableFacetViaValueSemantics.java     |   39 +
 .../object/value/MaxLengthFacetUsingParser.java    |   58 +
 .../value/TypicalLengthFacetUsingParser.java       |   53 +
 .../metamodel/facets/object/value/ValueFacet.java  |   35 +
 .../facets/object/value/ValueFacetAbstract.java    |  155 ++
 .../facets/object/value/ValueFacetSimple.java      |   37 +
 .../value/annotcfg/ValueFacetAnnotation.java       |   81 +
 ...ValueFacetAnnotationOrConfigurationFactory.java |  113 ++
 .../annotcfg/ValueFacetFromConfiguration.java      |   38 +
 .../vsp/ValueFacetUsingSemanticsProvider.java      |   41 +
 .../ValueFacetUsingSemanticsProviderFactory.java   |   46 +
 .../ValueSemanticsProviderAndFacetAbstract.java    |  328 ++++
 .../value/vsp/ValueSemanticsProviderUtil.java      |   67 +
 .../facets/object/viewmodel/ViewModelFacet.java    |  125 ++
 .../facets/object/wizard/WizardFacet.java          |   41 +
 .../facets/object/wizard/WizardFacetAbstract.java  |   36 +
 .../facets/objectvalue/choices/ChoicesFacet.java   |   49 +
 .../objectvalue/choices/ChoicesFacetAbstract.java  |   36 +
 .../objectvalue/fileaccept/FileAcceptFacet.java    |   35 +
 .../fileaccept/FileAcceptFacetAbstract.java        |   37 +
 .../facets/objectvalue/labelat/LabelAtFacet.java   |   36 +
 .../objectvalue/labelat/LabelAtFacetAbstract.java  |   56 +
 .../LabelAtFacetInferredFromMultiLineFacet.java    |   38 +
 .../objectvalue/mandatory/MandatoryFacet.java      |   57 +
 .../mandatory/MandatoryFacetAbstract.java          |  110 ++
 .../mandatory/MandatoryFacetDefault.java           |   43 +
 .../facets/objectvalue/maxlen/MaxLengthFacet.java  |   41 +
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |   75 +
 .../objectvalue/multiline/MultiLineFacet.java      |   51 +
 .../multiline/MultiLineFacetAbstract.java          |   63 +
 .../MustSatisfySpecificationFacet.java             |   27 +
 .../MustSatisfySpecificationFacetAbstract.java     |  124 ++
 .../mustsatisfyspec/SpecificationEvaluator.java    |   80 +
 .../facets/objectvalue/regex/RegExFacet.java       |   38 +
 .../objectvalue/regex/RegExFacetAbstract.java      |  104 ++
 .../renderedadjusted/RenderedAdjustedFacet.java    |   39 +
 .../RenderedAdjustedFacetAbstract.java             |   56 +
 .../objectvalue/typicallen/TypicalLengthFacet.java |   40 +
 .../typicallen/TypicalLengthFacetAbstract.java     |   45 +
 .../ActionParameterAutoCompleteFacet.java          |   47 +
 .../ActionParameterAutoCompleteFacetAbstract.java  |   41 +
 .../facets/param/autocomplete/MinLengthUtil.java   |   56 +
 .../ActionParameterAutoCompleteFacetViaMethod.java |  121 ++
 ...ParameterAutoCompleteFacetViaMethodFactory.java |   88 +
 ...ameterFromJavaxValidationAnnotationFactory.java |   56 +
 ...rameterFromJavaxValidationDigitsAnnotation.java |   59 +
 .../facets/param/choices/ActionChoicesFacet.java   |   38 +
 .../param/choices/ActionChoicesFacetAbstract.java  |   36 +
 .../param/choices/ActionParameterChoicesFacet.java |   42 +
 .../ActionParameterChoicesFacetAbstract.java       |   38 +
 .../choices/ActionParameterChoicesFacetNone.java   |   48 +
 ...rameterChoicesFacetDerivedFromChoicesFacet.java |   55 +
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   55 +
 .../method/ActionChoicesFacetViaMethod.java        |  121 ++
 .../method/ActionChoicesFacetViaMethodFactory.java |  100 ++
 .../ActionParameterChoicesFacetViaMethod.java      |  108 ++
 ...ctionParameterChoicesFacetViaMethodFactory.java |   99 ++
 .../defaults/ActionParameterDefaultsFacet.java     |   41 +
 .../ActionParameterDefaultsFacetAbstract.java      |   36 +
 ...ParameterDefaultFacetDerivedFromTypeFacets.java |   60 +
 ...arameterDefaultFacetDerivedFromTypeFactory.java |   64 +
 .../ActionParameterDefaultsFacetViaMethod.java     |  117 ++
 ...tionParameterDefaultsFacetViaMethodFactory.java |  134 ++
 ...ameterAnnotationElseDerivedFromTypeFactory.java |   55 +
 ...DescribedAsFacetOnParameterDerivedFromType.java |   32 +
 .../disable/ActionParameterDisabledFacet.java      |   41 +
 .../ActionParameterDisabledFacetAbstract.java      |   49 +
 .../ActionParameterDisabledFacetViaMethod.java     |   95 ++
 ...tionParameterDisabledFacetViaMethodFactory.java |   94 +
 .../param/hide/ActionParameterHiddenFacet.java     |   42 +
 .../hide/ActionParameterHiddenFacetAbstract.java   |   55 +
 .../ActionParameterHiddenFacetViaMethod.java       |   82 +
 ...ActionParameterHiddenFacetViaMethodFactory.java |   91 +
 .../CssClassFacetForParameterLayoutAnnotation.java |   46 +
 ...scribedAsFacetForParameterLayoutAnnotation.java |   46 +
 .../LabelAtFacetForParameterLayoutAnnotation.java  |   47 +
 ...MultiLineFacetForParameterLayoutAnnotation.java |   45 +
 .../NamedFacetForParameterLayoutAnnotation.java    |   51 +
 .../param/layout/ParameterLayoutFacetFactory.java  |   58 +
 ...dAdjustedFacetForParameterLayoutAnnotation.java |   58 +
 ...calLengthFacetForParameterLayoutAnnotation.java |   60 +
 .../MandatoryFacetOnParametersDefaultFactory.java  |   56 +
 .../NamedFacetForParameterUsingReflection.java     |   34 +
 .../ParameterNameFacetFactoryUsingReflection.java  |   74 +
 .../parameter/ParameterAnnotationFacetFactory.java |  134 ++
 .../FileAcceptFacetForParameterAnnotation.java     |   47 +
 .../MandatoryFacetForParameterAnnotation.java      |   81 +
 ...cetInvertedByNullableAnnotationOnParameter.java |   59 +
 .../MaxLengthFacetForParameterAnnotation.java      |   46 +
 ...fySpecificationFacetForParameterAnnotation.java |   69 +
 .../regex/RegExFacetForParameterAnnotation.java    |   72 +
 .../RegExFacetForPatternAnnotationOnParameter.java |   66 +
 .../TypicalLengthFacetOnParameterAnnotation.java   |   50 +
 ...picalLengthFacetOnParameterDerivedFromType.java |   49 +
 ...acetOnParameterDerivedFromTypeFacetFactory.java |   56 +
 .../validate/ActionParameterValidationFacet.java   |   46 +
 .../ActionParameterValidationFacetAbstract.java    |   47 +
 .../ActionParameterValidationFacetViaMethod.java   |   84 +
 ...onParameterValidationFacetViaMethodFactory.java |   83 +
 .../PropertyOrCollectionAccessorFacet.java         |   53 +
 .../PropertyOrCollectionAccessorFacetAbstract.java |   57 +
 .../propcoll/notpersisted/NotPersistedFacet.java   |   38 +
 .../notpersisted/NotPersistedFacetAbstract.java    |   36 +
 .../accessor/PropertyAccessorFacetViaAccessor.java |   96 ++
 .../PropertyAccessorFacetViaAccessorFactory.java   |  113 ++
 .../autocomplete/PropertyAutoCompleteFacet.java    |   51 +
 .../PropertyAutoCompleteFacetAbstract.java         |   39 +
 .../method/PropertyAutoCompleteFacetMethod.java    |  114 ++
 .../PropertyAutoCompleteFacetMethodFactory.java    |   79 +
 ...ropertyFromJavaxValidationDigitsAnnotation.java |   60 +
 ...FromJavaxValidationDigitsAnnotationFactory.java |   59 +
 .../properties/businesskey/BusinessKeyFacet.java   |   36 +
 .../businesskey/BusinessKeyFacetAbstract.java      |   36 +
 .../properties/choices/PropertyChoicesFacet.java   |   50 +
 .../choices/PropertyChoicesFacetAbstract.java      |   36 +
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |   52 +
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   45 +
 .../method/PropertyChoicesFacetViaMethod.java      |   93 +
 .../PropertyChoicesFacetViaMethodFactory.java      |   77 +
 .../properties/defaults/PropertyDefaultFacet.java  |   46 +
 .../defaults/PropertyDefaultFacetAbstract.java     |   36 +
 .../defaults/PropertyDefaultFacetNone.java         |   44 +
 ...pertyDefaultFacetDerivedFromDefaultedFacet.java |   57 +
 ...PropertyDefaultFacetDerivedFromTypeFactory.java |   64 +
 .../method/PropertyDefaultFacetViaMethod.java      |   88 +
 .../PropertyDefaultFacetViaMethodFactory.java      |   77 +
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   38 +
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   52 +
 .../inferred/DisabledFacetOnPropertyInferred.java  |   32 +
 .../DisabledFacetOnPropertyInferredFactory.java    |   56 +
 .../MandatoryFacetOnProperyDefaultFactory.java     |   57 +
 .../MultiLineFacetOnPropertyAnnotation.java        |   35 +
 .../properties/projection/ProjectingFacet.java     |   30 +
 .../projection/ProjectingFacetAbstract.java        |   41 +
 .../ProjectingFacetFromPropertyAnnotation.java     |   70 +
 .../property/PropertyAnnotationFacetFactory.java   |  377 ++++
 .../command/CommandFacetForPropertyAnnotation.java |   99 ++
 ...mandFacetForPropertyAnnotationAsConfigured.java |   37 +
 .../DisabledFacetForPropertyAnnotation.java        |   65 +
 ...acetForPropertyAnnotationInvertedSemantics.java |   32 +
 .../FileAcceptFacetForPropertyAnnotation.java      |   47 +
 .../hidden/HiddenFacetForPropertyAnnotation.java   |   56 +
 .../MandatoryFacetForPropertyAnnotation.java       |   90 +
 ...acetInvertedByNullableAnnotationOnProperty.java |   61 +
 .../MaxLengthFacetForPropertyAnnotation.java       |   46 +
 ...ropertyClearFacetForDomainEventFromDefault.java |   41 +
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 +
 .../property/modify/PropertyDomainEventFacet.java  |   33 +
 .../modify/PropertyDomainEventFacetAbstract.java   |  167 ++
 .../modify/PropertyDomainEventFacetDefault.java    |   40 +
 ...pertyDomainEventFacetForPropertyAnnotation.java |   40 +
 ...opertySetterFacetForDomainEventFromDefault.java |   42 +
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 +
 ...tySetterOrClearFacetForDomainEventAbstract.java |  340 ++++
 .../facets/properties/property/modify/Utils.java   |   23 +
 ...sfySpecificationFacetForPropertyAnnotation.java |   66 +
 .../NotPersistedFacetForPropertyAnnotation.java    |   46 +
 ...ublishedPropertyFacetForPropertyAnnotation.java |   79 +
 ...ertyFacetForPropertyAnnotationAsConfigured.java |   27 +
 .../PublishedPropertyFacetFromConfiguration.java   |   31 +
 .../RegExFacetForPatternAnnotationOnProperty.java  |   76 +
 .../regex/RegExFacetForPropertyAnnotation.java     |   70 +
 .../CssClassFacetForPropertyLayoutAnnotation.java  |   47 +
 .../CssClassFacetForPropertyXml.java               |   42 +
 ...escribedAsFacetForPropertyLayoutAnnotation.java |   47 +
 .../DescribedAsFacetForPropertyXml.java            |   42 +
 .../HiddenFacetForPropertyLayoutAnnotation.java    |   56 +
 .../propertylayout/HiddenFacetForPropertyXml.java  |   51 +
 .../LabelAtFacetForPropertyLayoutAnnotation.java   |   47 +
 .../propertylayout/LabelAtFacetForPropertyXml.java |   42 +
 .../MultiLineFacetForPropertyLayoutAnnotation.java |   46 +
 .../MultiLineFacetForPropertyXml.java              |   41 +
 .../NamedFacetForPropertyLayoutAnnotation.java     |   51 +
 .../propertylayout/NamedFacetForPropertyXml.java   |   47 +
 ...romptStyleFacetForPropertyLayoutAnnotation.java |   96 ++
 .../PromptStyleFacetForPropertyXml.java            |   57 +
 .../propertylayout/PropertyLayoutFacetFactory.java |  194 +++
 ...edAdjustedFacetForPropertyLayoutAnnotation.java |   58 +
 .../RenderedAdjustedFacetForPropertyXml.java       |   45 +
 ...icalLengthFacetForPropertyLayoutAnnotation.java |   61 +
 .../TypicalLengthFacetForPropertyXml.java          |   57 +
 ...UnchangingFacetForPropertyLayoutAnnotation.java |   59 +
 .../UnchangingFacetForPropertyXml.java             |   42 +
 .../properties/publish/PublishedPropertyFacet.java |   29 +
 .../publish/PublishedPropertyFacetAbstract.java    |   38 +
 ...nderedAsDayBeforeFacetAnnotationOnProperty.java |   38 +
 .../renderunchanged/UnchangingFacet.java           |   30 +
 .../renderunchanged/UnchangingFacetAbstract.java   |   36 +
 .../properties/searchable/SearchableFacet.java     |   49 +
 .../searchable/SearchableFacetAbstract.java        |   51 +
 .../TypicalLengthFacetOnPropertyAnnotation.java    |   50 +
 ...ypicalLengthFacetOnPropertyDerivedFromType.java |   49 +
 ...FacetOnPropertyDerivedFromTypeFacetFactory.java |   55 +
 .../update/NotPersistableFacetInferred.java        |   31 +
 .../update/PropertyModifyFacetFactory.java         |   68 +
 .../update/PropertySetAndClearFacetFactory.java    |  122 ++
 .../update/clear/PropertyClearFacet.java           |   43 +
 .../update/clear/PropertyClearFacetAbstract.java   |   35 +
 .../clear/PropertyClearFacetViaClearMethod.java    |   74 +
 .../clear/PropertyClearFacetViaSetterMethod.java   |   75 +
 .../update/init/PropertyInitializationFacet.java   |   50 +
 .../init/PropertyInitializationFacetAbstract.java  |   35 +
 ...PropertyInitializationFacetViaSetterMethod.java |   70 +
 .../update/modify/PropertySetterFacet.java         |   51 +
 .../update/modify/PropertySetterFacetAbstract.java |   35 +
 .../modify/PropertySetterFacetViaModifyMethod.java |   81 +
 .../modify/PropertySetterFacetViaSetterMethod.java |   76 +
 .../validating/PropertyValidateFacet.java          |   50 +
 .../validating/PropertyValidateFacetAbstract.java  |   57 +
 .../validating/PropertyValidateFacetNone.java      |   47 +
 .../dflt/PropertyValidateFacetDefault.java         |   49 +
 .../dflt/PropertyValidateFacetDefaultFactory.java  |   58 +
 .../method/PropertyValidateFacetViaMethod.java     |   83 +
 .../PropertyValidateFacetViaMethodFactory.java     |   76 +
 .../DateAndTimeValueSemanticsProviderAbstract.java |  116 ++
 .../core/metamodel/facets/value/JodaFunctions.java |   43 +
 .../ValueSemanticsProviderAbstractTemporal.java    |  373 ++++
 .../value/bigdecimal/BigDecimalValueFacet.java     |   60 +
 .../bigdecimal/BigDecimalValueFacetAbstract.java   |   37 +
 ...malValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../BigDecimalValueSemanticsProvider.java          |  143 ++
 .../value/biginteger/BigIntegerValueFacet.java     |   26 +
 ...gerValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../BigIntegerValueSemanticsProvider.java          |  110 ++
 .../facets/value/blobs/BlobValueFacet.java         |   26 +
 ...lobValueFacetUsingSemanticsProviderFactory.java |   41 +
 .../value/blobs/BlobValueSemanticsProvider.java    |  123 ++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../BooleanPrimitiveValueSemanticsProvider.java    |   55 +
 .../facets/value/booleans/BooleanValueFacet.java   |   29 +
 .../BooleanValueSemanticsProviderAbstract.java     |  129 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../BooleanWrapperValueSemanticsProvider.java      |   69 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../bytes/BytePrimitiveValueSemanticsProvider.java |   52 +
 .../facets/value/bytes/ByteValueFacet.java         |   30 +
 .../bytes/ByteValueSemanticsProviderAbstract.java  |  116 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../bytes/ByteWrapperValueSemanticsProvider.java   |   41 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../chars/CharPrimitiveValueSemanticsProvider.java |   54 +
 .../facets/value/chars/CharValueFacet.java         |   30 +
 .../chars/CharValueSemanticsProviderAbstract.java  |  103 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../chars/CharWrapperValueSemanticsProvider.java   |   41 +
 .../facets/value/clobs/ClobValueFacet.java         |   26 +
 ...lobValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../value/clobs/ClobValueSemanticsProvider.java    |  117 ++
 .../facets/value/date/DateValueFacet.java          |   33 +
 .../date/DateValueSemanticsProviderAbstract.java   |  121 ++
 .../value/datejdk8local/Jdk8LocalDateUtil.java     |  170 ++
 .../datejdk8local/Jdk8LocalDateValueFacet.java     |   33 +
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8LocalDateValueSemanticsProvider.java       |  252 +++
 .../facets/value/datejdk8local/TimeFormatter.java  |   27 +
 .../facets/value/datejdk8local/TimeParser.java     |   27 +
 .../value/datejodalocal/JodaLocalDateUtil.java     |  130 ++
 .../datejodalocal/JodaLocalDateValueFacet.java     |   33 +
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaLocalDateValueSemanticsProvider.java       |  257 +++
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../datesql/JavaSqlDateValueSemanticsProvider.java |   98 ++
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   |  157 ++
 .../Jdk8LocalDateTimeValueFacet.java               |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  272 +++
 .../value/datetimejdk8local/TimeFormatter.java     |   27 +
 .../facets/value/datetimejdk8local/TimeParser.java |   27 +
 .../Jdk8OffsetDateTimeValueFacet.java              |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  |  103 ++
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  121 ++
 .../value/datetimejoda/JodaDateTimeValueFacet.java |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaDateTimeValueSemanticsProvider.java        |  103 ++
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  121 ++
 .../datetimejodalocal/JodaLocalDateTimeUtil.java   |  127 ++
 .../JodaLocalDateTimeValueFacet.java               |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  259 +++
 ...ateValueFacetUsingSemanticsProviderFactory.java |   46 +
 .../JavaUtilDateValueSemanticsProvider.java        |   85 +
 .../doubles/DoubleFloatingPointValueFacet.java     |   30 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../DoublePrimitiveValueSemanticsProvider.java     |   54 +
 .../DoubleValueSemanticsProviderAbstract.java      |  120 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../DoubleWrapperValueSemanticsProvider.java       |   42 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../FloatPrimitiveValueSemanticsProvider.java      |   54 +
 .../FloatValueSemanticsProviderAbstract.java       |  116 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../floats/FloatWrapperValueSemanticsProvider.java |   41 +
 .../value/floats/FloatingPointValueFacet.java      |   30 +
 .../facets/value/image/ImageValueFacet.java        |   34 +
 ...ageValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../value/image/ImageValueSemanticsProvider.java   |  100 ++
 .../image/ImageValueSemanticsProviderAbstract.java |  298 ++++
 ...ageValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../JavaAwtImageValueSemanticsProvider.java        |   83 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../IntPrimitiveValueSemanticsProvider.java        |   54 +
 .../integer/IntValueSemanticsProviderAbstract.java |  114 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../integer/IntWrapperValueSemanticsProvider.java  |   41 +
 .../facets/value/integer/IntegerValueFacet.java    |   30 +
 .../localrespath/LocalResourcePathValueFacet.java  |   32 +
 ...athValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../LocalResourcePathValueSemanticsProvider.java   |  130 ++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../longs/LongPrimitiveValueSemanticsProvider.java |   52 +
 .../facets/value/longs/LongValueFacet.java         |   30 +
 .../longs/LongValueSemanticsProviderAbstract.java  |  113 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../longs/LongWrapperValueSemanticsProvider.java   |   41 +
 .../facets/value/markup/MarkupValueFacet.java      |   30 +
 ...kupValueFacetUsingSemanticsProviderFactory.java |   38 +
 .../value/markup/MarkupValueSemanticsProvider.java |  114 ++
 .../facets/value/password/PasswordValueFacet.java  |   33 +
 ...ordValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../password/PasswordValueSemanticsProvider.java   |  119 ++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../ShortPrimitiveValueSemanticsProvider.java      |   52 +
 .../facets/value/shortint/ShortValueFacet.java     |   30 +
 .../ShortValueSemanticsProviderAbstract.java       |  115 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../ShortWrapperValueSemanticsProvider.java        |   41 +
 .../facets/value/string/StringValueFacet.java      |   31 +
 ...ingValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../value/string/StringValueSemanticsProvider.java |  126 ++
 .../time/TimeValueSemanticsProviderAbstract.java   |  110 ++
 .../JodaLocalTimeValueFacetSimpleFactory.java      |   46 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   46 +
 .../timesql/JavaSqlTimeValueSemanticsProvider.java |   95 ++
 ...ampValueFacetUsingSemanticsProviderFactory.java |   47 +
 .../JavaSqlTimeStampValueSemanticsProvider.java    |   84 +
 .../TimeStampValueSemanticsProviderAbstract.java   |  101 ++
 .../facets/value/treenode/TreeNodeValueFacet.java  |   27 +
 ...odeValueFacetUsingSemanticsProviderFactory.java |   40 +
 .../treenode/TreeNodeValueSemanticsProvider.java   |  136 ++
 .../metamodel/facets/value/url/URLValueFacet.java  |   31 +
 ...URLValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../value/url/URLValueSemanticsProvider.java       |  127 ++
 .../facets/value/uuid/UUIDValueFacet.java          |   33 +
 ...UIDValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../value/uuid/UUIDValueSemanticsProvider.java     |  112 ++
 .../core/metamodel/interactions/AccessContext.java |   42 +
 .../interactions/ActionArgUsabilityContext.java    |   76 +
 .../interactions/ActionArgValidityContext.java     |   68 +
 .../interactions/ActionArgVisibilityContext.java   |   76 +
 .../interactions/ActionInteractionContext.java     |   31 +
 .../interactions/ActionUsabilityContext.java       |   60 +
 .../interactions/ActionValidityContext.java        |   64 +
 .../interactions/ActionVisibilityContext.java      |   60 +
 .../interactions/CollectionAccessContext.java      |   48 +
 .../interactions/CollectionAddToContext.java       |   56 +
 .../interactions/CollectionRemoveFromContext.java  |   58 +
 .../interactions/CollectionUsabilityContext.java   |   48 +
 .../interactions/CollectionVisibilityContext.java  |   50 +
 .../interactions/DisablingInteractionAdvisor.java  |   46 +
 .../interactions/HidingInteractionAdvisor.java     |   47 +
 .../interactions/InteractionAdvisorFacet.java      |   45 +
 .../metamodel/interactions/InteractionContext.java |  171 ++
 .../metamodel/interactions/InteractionUtils.java   |   81 +
 .../metamodel/interactions/ObjectTitleContext.java |   56 +
 .../interactions/ObjectValidityContext.java        |   53 +
 .../interactions/ObjectVisibilityContext.java      |   55 +
 .../metamodel/interactions/ParseValueContext.java  |   59 +
 .../interactions/PropertyAccessContext.java        |   60 +
 .../interactions/PropertyModifyContext.java        |   61 +
 .../interactions/PropertyUsabilityContext.java     |   50 +
 .../interactions/PropertyVisibilityContext.java    |   50 +
 .../metamodel/interactions/ProposedHolder.java     |   38 +
 .../metamodel/interactions/UsabilityContext.java   |   55 +
 .../interactions/ValidatingInteractionAdvisor.java |   51 +
 .../metamodel/interactions/ValidityContext.java    |   42 +
 .../metamodel/interactions/VisibilityContext.java  |   54 +
 .../isis/core/metamodel/layout/DeweyOrderSet.java  |  404 +++++
 .../MemberIdentifierComparator.java                |   44 +
 .../memberorderfacet/MemberOrderComparator.java    |   90 +
 .../MemberOrderFacetComparator.java                |   56 +
 .../OrderSetGroupNameComparator.java               |   55 +
 .../metamodel/objectmanager/ObjectManager.java     |  107 ++
 .../objectmanager/ObjectManagerDefault.java        |   77 +
 .../objectmanager/create/ObjectCreator.java        |   82 +
 .../create/ObjectCreator_builtinHandlers.java      |  386 +++++
 .../objectmanager/identify/ObjectIdentifier.java   |   63 +
 .../identify/ObjectIdentifier_builtinHandlers.java |  139 ++
 .../metamodel/objectmanager/load/ObjectLoader.java |   80 +
 .../load/ObjectLoader_builtinHandlers.java         |  258 +++
 .../objectmanager/refresh/ObjectRefresher.java     |   67 +
 .../refresh/ObjectRefresher_builtinHandlers.java   |  107 ++
 ...arameterChoicesFacetFromParentedCollection.java |   76 +
 ...meterDefaultsFacetFromAssociatedCollection.java |   64 +
 .../param/DeriveFacetsPostProcessor.java           |  635 +++++++
 .../ObjectSpecificationPostProcessor.java          |   28 +
 .../core/metamodel/progmodel/ProgrammingModel.java |  179 ++
 .../progmodel/ProgrammingModelAbstract.java        |  253 +++
 .../progmodel/ProgrammingModelInitFilter.java      |   80 +
 .../ProgrammingModelInitFilterDefault.java         |   85 +
 .../progmodel/ProgrammingModelService.java         |   32 +
 .../dflt/ProgrammingModelFacetsJava8.java          |  388 +++++
 .../core/metamodel/services/CollectionHelper.java  |  100 ++
 .../metamodel/services/ServiceInjectorDefault.java |   75 +
 .../metamodel/services/ServiceInjectorLegacy.java  |  286 ++++
 .../isis/core/metamodel/services/ServiceUtil.java  |   41 +
 .../services/appfeat/ApplicationFeature.java       |  324 ++++
 .../appfeat/ApplicationFeatureFactory.java         |   45 +
 .../services/appfeat/ApplicationFeatureId.java     |  492 ++++++
 .../ApplicationFeatureRepositoryDefault.java       |  556 ++++++
 .../services/appfeat/ApplicationFeatureType.java   |  102 ++
 .../classsubstitutor/ClassSubstitutor.java         |   28 +
 .../classsubstitutor/ClassSubstitutorAbstract.java |  137 ++
 .../classsubstitutor/ClassSubstitutorDefault.java  |   76 +
 .../ClassSubstitutorForCollections.java            |   64 +
 .../classsubstitutor/ClassSubstitutorRegistry.java |   80 +
 .../command/CommandDtoServiceInternal.java         |   71 +
 .../services/container/query/QueryCardinality.java |   31 +
 .../metamodel/services/devutils/MemberType.java    |   25 +
 .../services/events/MetamodelEventService.java     |   94 +
 .../events/MetamodelEventSupport_Spring.java       |   77 +
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   88 +
 .../services/grid/GridLoaderServiceDefault.java    |  257 +++
 .../services/grid/GridReaderUsingJaxb.java         |   76 +
 .../services/grid/GridServiceDefault.java          |  209 +++
 .../services/grid/GridSystemServiceAbstract.java   |  699 ++++++++
 .../grid/bootstrap3/DefaultGrid.layout.xml         |    0
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  674 ++++++++
 .../services/homepage/HomePageAction.java          |   63 +
 .../services/homepage/HomePageResolverService.java |   35 +
 .../metamodel/services/homepage/package-info.java  |   26 +
 .../ixn/InteractionDtoServiceInternal.java         |   51 +
 .../services/layout/LayoutServiceDefault.java      |  147 ++
 .../services/message/MessageServiceNoop.java       |   88 +
 .../services/metamodel/DomainMemberDefault.java    |  301 ++++
 .../services/metamodel/DomainModelDefault.java     |   58 +
 .../services/metamodel/MetaModelExportSupport.java |   31 +
 .../services/metamodel/MetaModelExporter.java      |  570 +++++++
 .../metamodel/MetaModelServiceDefault.java         |  272 +++
 .../core/metamodel/services/metamodel/Util.java    |   35 +
 .../publishing/PublisherDispatchService.java       |   46 +
 .../services/registry/ServiceRegistryDefault.java  |  103 ++
 .../services/registry/SpringContextProvider.java   |   23 +
 .../services/title/TitleServiceDefault.java        |   83 +
 .../title/TitlesAndTranslationsValidator.java      |  166 ++
 .../services/user/UserServiceDefault.java          |  177 ++
 .../isis/core/metamodel/spec/ActionType.java       |   41 +
 .../isis/core/metamodel/spec/DefaultProvider.java  |   31 +
 .../apache/isis/core/metamodel/spec/Described.java |   35 +
 .../core/metamodel/spec/DomainModelException.java  |   47 +
 .../spec/ElementSpecificationProvider.java         |   44 +
 .../isis/core/metamodel/spec/EntityState.java      |   49 +
 .../isis/core/metamodel/spec/FreeStandingList.java |   96 ++
 .../isis/core/metamodel/spec/Hierarchical.java     |   65 +
 .../metamodel/spec/InjectorMethodEvaluator.java    |   31 +
 .../isis/core/metamodel/spec/ManagedObject.java    |  734 ++++++++
 .../spec/ObjectInstantiationException.java         |   41 +
 .../isis/core/metamodel/spec/ObjectSpecId.java     |   62 +
 .../core/metamodel/spec/ObjectSpecification.java   |  445 +++++
 .../spec/ObjectSpecificationException.java         |   36 +
 .../isis/core/metamodel/spec/Specification.java    |   50 +
 .../core/metamodel/spec/feature/Contributed.java   |   31 +
 .../core/metamodel/spec/feature/CurrentHolder.java |   46 +
 .../spec/feature/MutableCurrentHolder.java         |   64 +
 .../core/metamodel/spec/feature/ObjectAction.java  |  589 +++++++
 .../spec/feature/ObjectActionContainer.java        |   80 +
 .../spec/feature/ObjectActionParameter.java        |  235 +++
 .../metamodel/spec/feature/ObjectAssociation.java  |  253 +++
 .../spec/feature/ObjectAssociationContainer.java   |   72 +
 .../core/metamodel/spec/feature/ObjectFeature.java |   79 +
 .../core/metamodel/spec/feature/ObjectMember.java  |  228 +++
 .../spec/feature/OneToManyActionParameter.java     |   28 +
 .../spec/feature/OneToManyAssociation.java         |  101 ++
 .../metamodel/spec/feature/OneToManyFeature.java   |   40 +
 .../spec/feature/OneToOneActionParameter.java      |   28 +
 .../spec/feature/OneToOneAssociation.java          |   53 +
 .../metamodel/spec/feature/OneToOneFeature.java    |   28 +
 .../core/metamodel/specloader/CollectionUtils.java |   61 +
 .../specloader/InjectorMethodEvaluatorDefault.java |   91 +
 .../specloader/ProgrammingModelServiceDefault.java |  104 ++
 .../specloader/ReflectiveActionException.java      |   43 +
 .../specloader/SpecificationCacheDefault.java      |  134 ++
 .../metamodel/specloader/SpecificationLoader.java  |  137 ++
 .../specloader/SpecificationLoaderDefault.java     |  521 ++++++
 .../SpecificationLoaderDefault_debug.java          |   79 +
 .../specloader/classsubstitutor/ProxyEnhanced.java |   28 +
 .../specloader/facetprocessor/FacetProcessor.java  |  486 ++++++
 .../core/metamodel/specloader/package-info.java    |   43 +
 .../specloader/postprocessor/PostProcessor.java    |   59 +
 .../specloader/specimpl/ContributeeMember.java     |   67 +
 .../specloader/specimpl/FacetedMethodsBuilder.java |  614 +++++++
 .../metamodel/specloader/specimpl/Factories.java   |   96 ++
 .../specloader/specimpl/IntrospectionState.java    |   47 +
 .../specloader/specimpl/MixedInMember.java         |   40 +
 .../specimpl/ObjectActionContributee.java          |  253 +++
 .../specloader/specimpl/ObjectActionDefault.java   |  688 ++++++++
 .../specloader/specimpl/ObjectActionMixedIn.java   |  260 +++
 .../specimpl/ObjectActionParameterAbstract.java    |  492 ++++++
 .../specimpl/ObjectActionParameterContributee.java |   25 +
 .../ObjectActionParameterContributeeAbstract.java  |   93 +
 .../specimpl/ObjectActionParameterMixedIn.java     |   25 +
 .../ObjectActionParameterMixedInAbstract.java      |   85 +
 .../specimpl/ObjectAssociationAbstract.java        |   97 ++
 .../specloader/specimpl/ObjectMemberAbstract.java  |  409 +++++
 .../specimpl/ObjectSpecificationAbstract.java      | 1119 ++++++++++++
 .../OneToManyActionParameterContributee.java       |   43 +
 .../specimpl/OneToManyActionParameterDefault.java  |   43 +
 .../specimpl/OneToManyActionParameterMixedIn.java  |   40 +
 .../specimpl/OneToManyAssociationContributee.java  |  191 +++
 .../specimpl/OneToManyAssociationDefault.java      |  288 ++++
 .../specimpl/OneToManyAssociationMixedIn.java      |  221 +++
 .../OneToOneActionParameterContributee.java        |   38 +
 .../specimpl/OneToOneActionParameterDefault.java   |   37 +
 .../specimpl/OneToOneActionParameterMixedIn.java   |   35 +
 .../specimpl/OneToOneAssociationContributee.java   |  174 ++
 .../specimpl/OneToOneAssociationDefault.java       |  361 ++++
 .../specimpl/OneToOneAssociationMixedIn.java       |  206 +++
 .../metamodel/specloader/specimpl/Predicates.java  |  168 ++
 .../core/metamodel/specloader/specimpl/Utils.java  |  103 ++
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  456 +++++
 .../CollectionFacetOnStandaloneList.java           |   73 +
 .../DescribedAsFacetOnStandaloneList.java          |   31 +
 .../standalonelist/NamedFacetOnStandaloneList.java |   31 +
 .../ObjectSpecificationOnStandaloneList.java       |  186 ++
 .../PluralFacetOnStandaloneList.java               |   31 +
 .../traverser/TypeExtractorAbstract.java           |   84 +
 .../traverser/TypeExtractorMethodParameters.java   |   60 +
 .../traverser/TypeExtractorMethodReturn.java       |   47 +
 .../validator/MetaModelInvalidException.java       |   33 +
 .../specloader/validator/MetaModelValidator.java   |   44 +
 .../validator/MetaModelValidatorAbstract.java      |   69 +
 ...etaModelValidatorForConflictingOptionality.java |   62 +
 .../MetaModelValidatorForDeprecatedAbstract.java   |   68 +
 .../MetaModelValidatorForDeprecatedAnnotation.java |   54 +
 ...etaModelValidatorForDeprecatedMethodPrefix.java |   52 +
 .../MetaModelValidatorForValidationFailures.java   |   23 +
 .../validator/MetaModelValidatorVisiting.java      |  111 ++
 .../specloader/validator/ValidationFailure.java    |   61 +
 .../specloader/validator/ValidationFailures.java   |  112 ++
 .../core/metamodel/util/DeweyOrderComparator.java  |   37 +
 .../apache/isis/core/metamodel/util/EventUtil.java |   43 +
 .../core/metamodel/util/pchain/ParentChain.java    |   83 +
 .../metamodel/util/pchain/ParentChainDefault.java  |   49 +
 .../isis/core/metamodel/util/snapshot/Helper.java  |   91 +
 .../core/metamodel/util/snapshot/IsisSchema.java   |  181 ++
 .../isis/core/metamodel/util/snapshot/Place.java   |   65 +
 .../core/metamodel/util/snapshot/XmlSchema.java    |  648 +++++++
 .../core/metamodel/util/snapshot/XmlSnapshot.java  |  916 ++++++++++
 .../core/metamodel/util/snapshot/XsMetaModel.java  |  337 ++++
 .../metamodel/valuetypes/ValueTypeDefinition.java  |   45 +
 .../metamodel/valuetypes/ValueTypeProvider.java    |   29 +
 .../valuetypes/ValueTypeProviderDefault.java       |   54 +
 .../ValueTypeProviderForCollections.java           |   51 +
 .../metamodel/valuetypes/ValueTypeRegistry.java    |   96 ++
 .../apache/isis/metamodel/IsisModuleMetamodel.java |  101 --
 .../isis/metamodel/adapter/ObjectAdapter.java      |   61 -
 .../metamodel/adapter/ObjectAdapterProvider.java   |   35 -
 .../adapter/oid/ObjectNotFoundException.java       |   36 -
 .../adapter/oid/ObjectPersistenceException.java    |   42 -
 .../org/apache/isis/metamodel/adapter/oid/Oid.java |  140 --
 .../isis/metamodel/adapter/oid/Oid_Marshaller.java |  254 ---
 .../isis/metamodel/adapter/oid/Oid_Parented.java   |  146 --
 .../isis/metamodel/adapter/oid/Oid_Root.java       |  167 --
 .../isis/metamodel/adapter/oid/Oid_Value.java      |   87 -
 .../isis/metamodel/adapter/oid/ParentedOid.java    |   54 -
 .../adapter/oid/PojoRecreationException.java       |   29 -
 .../adapter/oid/PojoRefreshException.java          |   32 -
 .../apache/isis/metamodel/adapter/oid/RootOid.java |   46 -
 .../isis/metamodel/adapter/package-info.java       |   32 -
 .../authorization/standard/AuthorizationFacet.java |   32 -
 .../standard/AuthorizationFacetAbstract.java       |   78 -
 .../standard/AuthorizationFacetFactory.java        |   46 -
 .../standard/AuthorizationFacetImpl.java           |   30 -
 .../authorization/standard/package-info.java       |   33 -
 .../isis/metamodel/commons/ArrayExtensions.java    |   69 -
 .../apache/isis/metamodel/commons/CanBeVoid.java   |   25 -
 .../isis/metamodel/commons/ClassExtensions.java    |  175 --
 .../isis/metamodel/commons/ClassFunctions.java     |   46 -
 .../isis/metamodel/commons/ClassPredicates.java    |   37 -
 .../apache/isis/metamodel/commons/ClassUtil.java   |  192 ---
 .../metamodel/commons/CloseableExtensions.java     |   40 -
 .../isis/metamodel/commons/DateExtensions.java     |   35 -
 .../metamodel/commons/InputStreamExtensions.java   |   69 -
 .../isis/metamodel/commons/ListExtensions.java     |  115 --
 .../apache/isis/metamodel/commons/LocaleUtil.java  |   40 -
 .../org/apache/isis/metamodel/commons/MapUtil.java |   48 -
 .../isis/metamodel/commons/MethodExtensions.java   |   92 -
 .../commons/MethodInvocationPreprocessor.java      |  154 --
 .../apache/isis/metamodel/commons/MethodUtil.java  |  202 ---
 .../isis/metamodel/commons/ObjectExtensions.java   |   82 -
 .../isis/metamodel/commons/ResourceUtil.java       |   83 -
 .../isis/metamodel/commons/StringExtensions.java   |  393 -----
 .../metamodel/commons/ThrowableExtensions.java     |   82 -
 .../apache/isis/metamodel/commons/ToString.java    |  165 --
 .../apache/isis/metamodel/commons/Wormhole.java    |   50 -
 .../isis/metamodel/commons/package-info.java       |   27 -
 .../org/apache/isis/metamodel/consent/Allow.java   |   56 -
 .../org/apache/isis/metamodel/consent/Consent.java |   73 -
 .../isis/metamodel/consent/ConsentAbstract.java    |  159 --
 .../isis/metamodel/consent/InteractionAdvisor.java |  103 --
 .../metamodel/consent/InteractionContextType.java  |  135 --
 .../metamodel/consent/InteractionInitiatedBy.java  |   33 -
 .../isis/metamodel/consent/InteractionResult.java  |  155 --
 .../metamodel/consent/InteractionResultSet.java    |  104 --
 .../org/apache/isis/metamodel/consent/Veto.java    |   48 -
 .../isis/metamodel/context/MetaModelContext.java   |  213 ---
 .../metamodel/context/MetaModelContextAware.java   |   29 -
 .../context/MetaModelContext_usingIoc.java         |  173 --
 .../isis/metamodel/context/MetaModelContexts.java  |   44 -
 .../metamodel/exceptions/MetaModelException.java   |   43 -
 .../persistence/ObjectNotFoundException.java       |   38 -
 .../persistence/ObjectPersistenceException.java    |   42 -
 .../persistence/PojoRecreationException.java       |   31 -
 .../persistence/PojoRefreshException.java          |   34 -
 .../org/apache/isis/metamodel/facetapi/Facet.java  |  123 --
 .../isis/metamodel/facetapi/FacetAbstract.java     |  287 ----
 .../isis/metamodel/facetapi/FacetHolder.java       |  150 --
 .../isis/metamodel/facetapi/FacetHolderImpl.java   |  168 --
 .../apache/isis/metamodel/facetapi/FacetUtil.java  |   96 --
 .../metamodel/facetapi/FacetWithAttributes.java    |   32 -
 .../isis/metamodel/facetapi/FeatureType.java       |  159 --
 .../isis/metamodel/facetapi/IdentifiedHolder.java  |   31 -
 .../isis/metamodel/facetapi/MetaModelRefiner.java  |   34 -
 .../isis/metamodel/facetapi/MethodRemover.java     |   71 -
 .../apache/isis/metamodel/facets/Annotations.java  |  695 --------
 .../isis/metamodel/facets/CollectionUtils.java     |  129 --
 .../facets/ContributeeMemberFacetFactory.java      |   45 -
 .../isis/metamodel/facets/DependentArgUtils.java   |  199 ---
 .../isis/metamodel/facets/DomainEventHelper.java   |  441 -----
 .../apache/isis/metamodel/facets/FacetFactory.java |  337 ----
 .../metamodel/facets/FacetFactoryAbstract.java     |   70 -
 .../isis/metamodel/facets/FacetedMethod.java       |  215 ---
 .../metamodel/facets/FacetedMethodParameter.java   |   50 -
 .../isis/metamodel/facets/ImperativeFacet.java     |  169 --
 .../metamodel/facets/ImperativeFacetMulti.java     |   33 -
 .../facets/MethodFilteringFacetFactory.java        |   33 -
 .../isis/metamodel/facets/MethodFinderUtils.java   |  239 ---
 .../metamodel/facets/MethodLiteralConstants.java   |   77 -
 .../facets/MethodPrefixBasedFacetFactory.java      |   39 -
 .../MethodPrefixBasedFacetFactoryAbstract.java     |  140 --
 .../metamodel/facets/MethodRemoverConstants.java   |   44 -
 .../isis/metamodel/facets/MultipleValueFacet.java  |   26 -
 .../metamodel/facets/ObjectSpecIdFacetFactory.java |   37 -
 .../facets/OrphanedSupportingMethodValidator.java  |  126 --
 .../metamodel/facets/PostConstructMethodCache.java |   30 -
 ...ropertyOrCollectionIdentifyingFacetFactory.java |   83 -
 ...rCollectionIdentifyingFacetFactoryAbstract.java |   43 -
 .../metamodel/facets/SingleClassValueFacet.java    |   35 -
 .../facets/SingleClassValueFacetAbstract.java      |   60 -
 .../isis/metamodel/facets/SingleIntValueFacet.java |   27 -
 .../facets/SingleIntValueFacetAbstract.java        |   47 -
 .../metamodel/facets/SingleStringValueFacet.java   |   23 -
 .../facets/SingleStringValueFacetAbstract.java     |   58 -
 .../isis/metamodel/facets/SingleValueFacet.java    |   28 -
 .../metamodel/facets/SingleValueFacetAbstract.java |   46 -
 .../apache/isis/metamodel/facets/TypedHolder.java  |   55 -
 .../isis/metamodel/facets/TypedHolderDefault.java  |   58 -
 .../isis/metamodel/facets/WhereValueFacet.java     |   29 -
 .../metamodel/facets/WhereValueFacetAbstract.java  |   57 -
 ...lementSpecificationProviderFromTypeOfFacet.java |   37 -
 .../facets/actcoll/typeof/TypeOfFacet.java         |  126 --
 .../facets/actcoll/typeof/TypeOfFacetAbstract.java |   40 -
 .../actcoll/typeof/TypeOfFacetDefaultToObject.java |   30 -
 .../typeof/TypeOfFacetInferredFromArray.java       |   30 -
 .../typeof/TypeOfFacetInferredFromGenerics.java    |   30 -
 .../action/ActionAnnotationFacetFactory.java       |  287 ----
 ...nChoicesForCollectionParameterFacetFactory.java |  161 --
 .../action/associateWith/AssociatedWithFacet.java  |   30 -
 .../associateWith/AssociatedWithFacetAbstract.java |   45 -
 .../AssociatedWithFacetForActionAnnotation.java    |   32 -
 .../command/CommandFacetForActionAnnotation.java   |  123 --
 ...ommandFacetForActionAnnotationAsConfigured.java |   39 -
 .../command/CommandFacetFromConfiguration.java     |   46 -
 .../hidden/HiddenFacetForActionAnnotation.java     |   56 -
 .../action/invocation/ActionDomainEventFacet.java  |   33 -
 .../invocation/ActionDomainEventFacetAbstract.java |  165 --
 .../invocation/ActionDomainEventFacetDefault.java  |   33 -
 .../ActionDomainEventFacetForActionAnnotation.java |   32 -
 .../action/invocation/ActionInvocationFacet.java   |   52 -
 .../invocation/ActionInvocationFacetAbstract.java  |   38 -
 ...ctionInvocationFacetForDomainEventAbstract.java |  513 ------
 ...ionFacetForDomainEventFromActionAnnotation.java |   40 -
 ...onInvocationFacetForDomainEventFromDefault.java |   40 -
 .../actions/action/invocation/CommandUtil.java     |  114 --
 .../PrototypeFacetForActionAnnotation.java         |   51 -
 .../PublishedActionFacetForActionAnnotation.java   |   99 --
 ...ActionFacetForActionAnnotationAsConfigured.java |   31 -
 .../PublishedActionFacetFromConfiguration.java     |   32 -
 ...ctionSemanticsFacetFallbackToNonIdempotent.java |   32 -
 .../ActionSemanticsFacetForActionAnnotation.java   |   49 -
 .../typeof/TypeOfFacetForActionAnnotation.java     |   33 -
 .../facets/actions/command/CommandFacet.java       |   55 -
 .../actions/command/CommandFacetAbstract.java      |  123 --
 .../actions/defaults/ActionDefaultsFacet.java      |   35 -
 .../defaults/ActionDefaultsFacetAbstract.java      |   36 -
 .../method/ActionDefaultsFacetViaMethod.java       |   88 -
 .../ActionDefaultsFacetViaMethodFactory.java       |   88 -
 .../FileAcceptFacetForActionAnnotation.java        |   47 -
 .../facets/actions/homepage/HomePageFacet.java     |   34 -
 .../actions/homepage/HomePageFacetAbstract.java    |   36 -
 .../facets/actions/homepage/HomePageFacetImpl.java |   30 -
 .../annotation/HomePageFacetAnnotation.java        |   31 -
 .../annotation/HomePageFacetAnnotationFactory.java |  130 --
 .../actions/layout/ActionLayoutFacetFactory.java   |  171 --
 ...tionPositionFacetForActionLayoutAnnotation.java |   46 -
 .../layout/ActionPositionFacetForActionXml.java    |   41 -
 ...okmarkPolicyFacetForActionLayoutAnnotation.java |   58 -
 .../layout/BookmarkPolicyFacetForActionXml.java    |   42 -
 .../CssClassFaFacetForActionLayoutAnnotation.java  |   57 -
 .../layout/CssClassFaFacetForActionXml.java        |   44 -
 .../CssClassFacetForActionLayoutAnnotation.java    |   47 -
 .../actions/layout/CssClassFacetForActionXml.java  |   42 -
 .../DescribedAsFacetForActionLayoutAnnotation.java |   47 -
 .../layout/DescribedAsFacetForActionXml.java       |   42 -
 .../HiddenFacetForActionLayoutAnnotation.java      |   56 -
 .../actions/layout/HiddenFacetForActionXml.java    |   51 -
 .../NamedFacetForActionLayoutAnnotation.java       |   48 -
 .../actions/layout/NamedFacetForActionXml.java     |   44 -
 ...tContributedFacetForActionLayoutAnnotation.java |   52 -
 .../PromptStyleFacetForActionLayoutAnnotation.java |   97 --
 .../layout/PromptStyleFacetForActionXml.java       |   57 -
 .../RedirectFacetFromActionLayoutAnnotation.java   |   47 -
 .../actions/layout/RedirectFacetFromActionXml.java |   43 -
 .../notcontributed/NotContributedFacet.java        |   40 -
 .../NotContributedFacetAbstract.java               |   73 -
 ...tributedFacetDerivedFromDomainServiceFacet.java |   47 -
 ...dFacetDerivedFromDomainServiceFacetFactory.java |   58 -
 .../NotContributedFacetDerivedFromMixinFacet.java  |   37 -
 ...ntributedFacetDerivedFromMixinFacetFactory.java |   52 -
 .../notinservicemenu/NotInServiceMenuFacet.java    |   38 -
 .../NotInServiceMenuFacetAbstract.java             |   40 -
 ...viceMenuFacetDerivedFromDomainServiceFacet.java |   54 -
 ...uFacetDerivedFromDomainServiceFacetFactory.java |   59 -
 .../actions/position/ActionPositionFacet.java      |   44 -
 .../position/ActionPositionFacetAbstract.java      |   57 -
 .../position/ActionPositionFacetFallback.java      |   31 -
 .../facets/actions/prototype/PrototypeFacet.java   |   30 -
 .../actions/prototype/PrototypeFacetAbstract.java  |   56 -
 .../actions/publish/PublishedActionFacet.java      |   30 -
 .../publish/PublishedActionFacetAbstract.java      |   38 -
 .../facets/actions/redirect/RedirectFacet.java     |   33 -
 .../actions/redirect/RedirectFacetAbstract.java    |   66 -
 .../actions/redirect/RedirectFacetFallback.java    |   31 -
 .../actions/semantics/ActionSemanticsFacet.java    |   33 -
 .../semantics/ActionSemanticsFacetAbstract.java    |   39 -
 .../validate/ActionParameterValidationFacet.java   |   45 -
 .../ActionParameterValidationFacetAbstract.java    |   47 -
 .../actions/validate/ActionValidationFacet.java    |   50 -
 .../validate/ActionValidationFacetAbstract.java    |   47 -
 .../ActionParameterValidationFacetViaMethod.java   |   84 -
 .../method/ActionValidationFacetViaMethod.java     |   85 -
 .../ActionValidationFacetViaMethodFactory.java     |  117 --
 .../facets/all/deficiencies/DeficiencyFacet.java   |  134 --
 .../facets/all/describedas/DescribedAsFacet.java   |   33 -
 .../all/describedas/DescribedAsFacetAbstract.java  |   36 -
 .../isis/metamodel/facets/all/help/HelpFacet.java  |   29 -
 .../facets/all/help/HelpFacetAbstract.java         |   36 -
 .../metamodel/facets/all/hide/HiddenFacet.java     |   31 -
 .../all/i18n/DescribedAsFacetTranslated.java       |   64 -
 .../facets/all/i18n/NamedFacetTranslated.java      |   72 -
 .../facets/all/i18n/PluralFacetTranslated.java     |   55 -
 .../facets/all/i18n/TranslationFacetFactory.java   |  119 --
 .../metamodel/facets/all/named/NamedFacet.java     |   42 -
 .../facets/all/named/NamedFacetAbstract.java       |   59 -
 .../facets/all/named/NamedFacetInferred.java       |   31 -
 .../collections/CollectionFacetAbstract.java       |   40 -
 .../CollectionAccessorFacetViaAccessor.java        |  109 --
 .../CollectionAccessorFacetViaAccessorFactory.java |  112 --
 .../clear/CollectionClearFacetFactory.java         |   70 -
 .../clear/CollectionClearFacetViaAccessor.java     |   79 -
 .../clear/CollectionClearFacetViaClearMethod.java  |   70 -
 .../CollectionAnnotationFacetFactory.java          |  293 ----
 .../collection/defaultview/DefaultViewFacet.java   |   26 -
 .../defaultview/DefaultViewFacetAbstract.java      |   35 -
 .../DisabledFacetForCollectionAnnotation.java      |   69 -
 .../hidden/HiddenFacetForCollectionAnnotation.java |   56 -
 ...ectionAddToFacetForDomainEventFromAbstract.java |  124 --
 ...acetForDomainEventFromCollectionAnnotation.java |   43 -
 ...lectionAddToFacetForDomainEventFromDefault.java |   41 -
 .../modify/CollectionDomainEventFacet.java         |   34 -
 .../modify/CollectionDomainEventFacetAbstract.java |  145 --
 .../modify/CollectionDomainEventFacetDefault.java  |   32 -
 ...ionDomainEventFacetForCollectionAnnotation.java |   45 -
 ...nRemoveFromFacetForDomainEventFromAbstract.java |  123 --
 ...acetForDomainEventFromCollectionAnnotation.java |   43 -
 ...onRemoveFromFacetForDomainEventFromDefault.java |   41 -
 .../NotPersistedFacetForCollectionAnnotation.java  |   55 -
 ...fFacetOnCollectionFromCollectionAnnotation.java |   47 -
 ...abledFacetOnCollectionDerivedFromImmutable.java |   39 -
 ...cetOnCollectionDerivedFromImmutableFactory.java |   45 -
 .../javautilcollection/CollectionFacetFactory.java |   86 -
 .../javautilcollection/JavaArrayFacet.java         |   84 -
 .../javautilcollection/JavaCollectionFacet.java    |   78 -
 .../layout/CollectionLayoutFacetFactory.java       |  123 --
 ...CssClassFacetForCollectionLayoutAnnotation.java |   45 -
 .../layout/CssClassFacetForCollectionXml.java      |   42 -
 ...aultViewFacetForCollectionLayoutAnnotation.java |   48 -
 .../layout/DefaultViewFacetForCollectionXml.java   |   42 -
 ...cribedAsFacetForCollectionLayoutAnnotation.java |   45 -
 .../layout/DescribedAsFacetForCollectionXml.java   |   42 -
 .../HiddenFacetForCollectionLayoutAnnotation.java  |   58 -
 .../layout/HiddenFacetForCollectionXml.java        |   51 -
 .../NamedFacetForCollectionLayoutAnnotation.java   |   52 -
 .../layout/NamedFacetForCollectionXml.java         |   47 -
 .../PagedFacetForCollectionLayoutAnnotation.java   |   46 -
 .../layout/PagedFacetForCollectionXml.java         |   41 -
 ...SortedByFacetForCollectionLayoutAnnotation.java |   53 -
 .../layout/SortedByFacetForCollectionXml.java      |   56 -
 .../collections/modify/CollectionAddToFacet.java   |   37 -
 .../modify/CollectionAddToFacetAbstract.java       |   36 -
 .../modify/CollectionAddToFacetViaAccessor.java    |   77 -
 .../modify/CollectionAddToFacetViaMethod.java      |   74 -
 ...tionAddToRemoveFromAndValidateFacetFactory.java |  177 --
 .../collections/modify/CollectionClearFacet.java   |   36 -
 .../modify/CollectionClearFacetAbstract.java       |   36 -
 .../facets/collections/modify/CollectionFacet.java |  112 --
 .../modify/CollectionRemoveFromFacet.java          |   39 -
 .../modify/CollectionRemoveFromFacetAbstract.java  |   36 -
 .../CollectionRemoveFromFacetViaAccessor.java      |   80 -
 .../modify/CollectionRemoveFromFacetViaMethod.java |   74 -
 .../TypeOfFacetInferredFromSupportingMethods.java  |   31 -
 .../parented/ParentedCollectionFacetDefault.java   |   37 -
 .../ParentedFacetSinceCollectionFactory.java       |   53 -
 .../facets/collections/sortedby/SortedByFacet.java |   32 -
 .../sortedby/SortedByFacetAbstract.java            |   38 -
 .../annotation/SortedByFacetAnnotationFactory.java |   91 -
 .../validate/CollectionValidateAddToFacet.java     |   40 -
 .../CollectionValidateAddToFacetAbstract.java      |   48 -
 .../CollectionValidateAddToFacetViaMethod.java     |   82 -
 .../CollectionValidateRemoveFromFacet.java         |   39 -
 .../CollectionValidateRemoveFromFacetAbstract.java |   47 -
 ...CollectionValidateRemoveFromFacetViaMethod.java |   83 -
 .../collparam/semantics/CollectionSemantics.java   |  125 --
 .../semantics/CollectionSemanticsFacet.java        |   29 -
 .../semantics/CollectionSemanticsFacetDefault.java |   47 -
 .../facets/fallback/ActionChoicesFacetNone.java    |   45 -
 .../facets/fallback/ActionDefaultsFacetNone.java   |   42 -
 .../facets/fallback/DescribedAsFacetNone.java      |   39 -
 .../facets/fallback/FallbackFacetFactory.java      |  144 --
 .../metamodel/facets/fallback/HelpFacetNone.java   |   44 -
 .../LabelAtFacetFromLayoutConfiguration.java       |   30 -
 .../facets/fallback/MaxLengthFacetUnlimited.java   |   46 -
 .../facets/fallback/MultiLineFacetNone.java        |   36 -
 .../facets/fallback/NamedFacetDefault.java         |   33 -
 .../metamodel/facets/fallback/NamedFacetNone.java  |   44 -
 .../fallback/PagedFacetFromConfiguration.java      |   29 -
 .../metamodel/facets/fallback/TitleFacetNone.java  |   42 -
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  399 -----
 .../facets/jaxb/XmlAccessorTypeFacet.java          |   31 -
 .../facets/jaxb/XmlAccessorTypeFacetAbstract.java  |   40 -
 .../facets/jaxb/XmlAccessorTypeFacetDefault.java   |   33 -
 .../facets/jaxb/XmlJavaTypeAdapterFacet.java       |   29 -
 .../jaxb/XmlJavaTypeAdapterFacetAbstract.java      |   38 -
 .../jaxb/XmlJavaTypeAdapterFacetDefault.java       |   31 -
 .../metamodel/facets/jaxb/XmlTransientFacet.java   |   29 -
 .../facets/jaxb/XmlTransientFacetAbstract.java     |   37 -
 .../facets/jaxb/XmlTransientFacetDefault.java      |   30 -
 .../facets/members/cssclass/CssClassFacet.java     |   37 -
 .../members/cssclass/CssClassFacetAbstract.java    |   51 -
 .../members/cssclass/CssClassFacetAbstract2.java   |   36 -
 .../CssClassFacetOnActionFromConfiguredRegex.java  |   30 -
 ...assFacetOnActionFromConfiguredRegexFactory.java |  120 --
 .../facets/members/cssclassfa/CssClassFaFacet.java |   37 -
 .../cssclassfa/CssClassFaFacetAbstract.java        |   79 -
 .../members/cssclassfa/CssClassFaPosition.java     |  104 --
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |  103 --
 ...CssClassFaFacetOnMemberFromConfiguredRegex.java |   31 -
 .../CssClassFaFacetOnMemberFromProperties.java     |   40 -
 .../cssclassfa/annotprop/MixinInterceptor.java     |   64 -
 .../DescribedAsFacetOnMemberDerivedFromType.java   |   32 -
 .../annotprop/DescribedAsFacetOnMemberFactory.java |   64 -
 .../DescribedAsFacetOnMemberFromProperties.java    |   37 -
 .../facets/members/disabled/DisabledFacet.java     |   54 -
 .../members/disabled/DisabledFacetAbstract.java    |  102 --
 .../DisabledFacetAbstractAlwaysEverywhere.java     |   40 -
 .../disabled/DisabledFacetAbstractImpl.java        |   83 -
 .../disabled/DisabledFacetForContributee.java      |   30 -
 .../disabled/method/DisableForContextFacet.java    |   37 -
 .../method/DisableForContextFacetAbstract.java     |   37 -
 .../method/DisableForContextFacetNone.java         |   49 -
 .../method/DisableForContextFacetViaMethod.java    |  100 --
 .../DisableForContextFacetViaMethodFactory.java    |   94 -
 .../facets/members/hidden/HiddenFacetAbstract.java |   84 -
 .../HiddenFacetAbstractAlwaysEverywhere.java       |   50 -
 .../members/hidden/HiddenFacetAbstractImpl.java    |   52 -
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   53 -
 .../members/hidden/method/HideForContextFacet.java |   37 -
 .../hidden/method/HideForContextFacetAbstract.java |   37 -
 .../hidden/method/HideForContextFacetNone.java     |   45 -
 .../method/HideForContextFacetViaMethod.java       |   78 -
 .../HideForContextFacetViaMethodFactory.java       |   82 -
 .../facets/members/order/MemberOrderFacet.java     |   59 -
 .../members/order/MemberOrderFacetAbstract.java    |  107 --
 .../annotprop/MemberOrderFacetAnnotation.java      |   35 -
 .../order/annotprop/MemberOrderFacetFactory.java   |   69 -
 .../MemberOrderFacetForActionAnnotation.java       |   34 -
 .../annotprop/MemberOrderFacetProperties.java      |   49 -
 .../order/annotprop/MemberOrderFacetXml.java       |   35 -
 .../ViewModelSemanticCheckingFacetFactory.java     |  209 ---
 .../facets/object/audit/AuditableFacet.java        |   40 -
 .../object/audit/AuditableFacetAbstract.java       |   61 -
 .../facets/object/audit/AuditableFacetImpl.java    |   30 -
 .../object/autocomplete/AutoCompleteFacet.java     |   35 -
 .../autocomplete/AutoCompleteFacetAbstract.java    |  126 --
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |   31 -
 .../BookmarkPolicyFacetAbstract.java               |   59 -
 .../BookmarkPolicyFacetFallback.java               |   32 -
 .../BookmarkPolicyFacetFallbackFactory.java        |   88 -
 .../facets/object/callbacks/CallbackFacet.java     |   53 -
 .../object/callbacks/CallbackFacetAbstract.java    |   35 -
 .../object/callbacks/CreatedCallbackFacet.java     |   36 -
 .../callbacks/CreatedCallbackFacetAbstract.java    |   35 -
 .../callbacks/CreatedCallbackFacetFactory.java     |   51 -
 .../callbacks/CreatedCallbackFacetViaMethod.java   |   70 -
 .../callbacks/CreatedLifecycleEventFacet.java      |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   46 -
 .../object/callbacks/LifecycleEventFacet.java      |   28 -
 .../object/callbacks/LoadCallbackFacetFactory.java |   65 -
 .../object/callbacks/LoadedCallbackFacet.java      |   37 -
 .../callbacks/LoadedCallbackFacetAbstract.java     |   35 -
 .../callbacks/LoadedCallbackFacetViaMethod.java    |   71 -
 .../callbacks/LoadedLifecycleEventFacet.java       |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 -
 .../object/callbacks/LoadingCallbackFacet.java     |   28 -
 .../callbacks/LoadingCallbackFacetAbstract.java    |   39 -
 .../callbacks/LoadingCallbackFacetViaMethod.java   |   75 -
 .../callbacks/PersistCallbackFacetFactory.java     |   78 -
 .../PersistCallbackViaSaveMethodFacetFactory.java  |   78 -
 .../object/callbacks/PersistedCallbackFacet.java   |   36 -
 .../callbacks/PersistedCallbackFacetAbstract.java  |   35 -
 .../callbacks/PersistedCallbackFacetViaMethod.java |   71 -
 .../callbacks/PersistedLifecycleEventFacet.java    |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 -
 .../object/callbacks/PersistingCallbackFacet.java  |   37 -
 .../callbacks/PersistingCallbackFacetAbstract.java |   35 -
 .../PersistingCallbackFacetViaMethod.java          |   71 -
 .../callbacks/PersistingLifecycleEventFacet.java   |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../callbacks/RemoveCallbackFacetFactory.java      |   81 -
 .../RemoveCallbackViaDeleteMethodFacetFactory.java |   81 -
 .../object/callbacks/RemovedCallbackFacet.java     |   35 -
 .../callbacks/RemovedCallbackFacetAbstract.java    |   39 -
 .../callbacks/RemovedCallbackFacetViaMethod.java   |   75 -
 .../object/callbacks/RemovingCallbackFacet.java    |   34 -
 .../callbacks/RemovingCallbackFacetAbstract.java   |   35 -
 .../callbacks/RemovingCallbackFacetViaMethod.java  |   71 -
 .../callbacks/RemovingLifecycleEventFacet.java     |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../callbacks/UpdateCallbackFacetFactory.java      |   68 -
 .../object/callbacks/UpdatedCallbackFacet.java     |   37 -
 .../callbacks/UpdatedCallbackFacetAbstract.java    |   35 -
 .../callbacks/UpdatedCallbackFacetViaMethod.java   |   71 -
 .../callbacks/UpdatedLifecycleEventFacet.java      |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../object/callbacks/UpdatingCallbackFacet.java    |   37 -
 .../callbacks/UpdatingCallbackFacetAbstract.java   |   35 -
 .../callbacks/UpdatingCallbackFacetViaMethod.java  |   71 -
 .../callbacks/UpdatingLifecycleEventFacet.java     |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../choices/ChoicesFacetFromBoundedAbstract.java   |  119 --
 .../facets/object/choices/ChoicesFacetUtils.java   |   42 -
 .../facets/object/choices/QueryFindAllChoices.java |   57 -
 .../object/choices/enums/ChoicesFacetEnum.java     |   49 -
 .../facets/object/choices/enums/EnumFacet.java     |   26 -
 ...ingValueFacetUsingSemanticsProviderFactory.java |   49 -
 .../choices/enums/EnumValueSemanticsProvider.java  |  152 --
 .../cssclass/method/CssClassFacetMethod.java       |   61 -
 .../method/CssClassFacetMethodFactory.java         |   52 -
 ...ssClassFaFacetForDomainObjectLayoutFactory.java |   43 -
 .../CssClassFaFacetForViewModelLayoutFactory.java  |   45 -
 .../facets/object/defaults/DefaultedFacet.java     |   47 -
 .../object/defaults/DefaultedFacetAbstract.java    |   84 -
 .../DefaultedFacetUsingDefaultsProvider.java       |   47 -
 .../object/defaults/DefaultsProviderUtil.java      |   75 -
 .../annotcfg/DefaultedFacetAnnotation.java         |   62 -
 ...tedFacetAnnotationElseConfigurationFactory.java |   71 -
 .../annotcfg/DefaultedFacetFromConfiguration.java  |   31 -
 .../object/disabled/DisabledObjectFacet.java       |   54 -
 .../disabled/DisabledObjectFacetAbstract.java      |   52 -
 .../method/DisabledObjectFacetViaMethod.java       |   93 -
 .../DisabledObjectFacetViaMethodFactory.java       |   88 -
 .../DomainObjectAnnotationFacetFactory.java        |  570 -------
 .../AuditableFacetForDomainObjectAnnotation.java   |   74 -
 ...FacetForDomainObjectAnnotationAsConfigured.java |   31 -
 .../auditing/AuditableFacetFromConfiguration.java  |   36 -
 ...AutoCompleteFacetForDomainObjectAnnotation.java |   46 -
 .../ChoicesFacetForDomainObjectAnnotation.java     |   49 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   52 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 -
 .../ImmutableFacetForDomainObjectAnnotation.java   |  101 --
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 -
 .../editing/ImmutableFacetFromConfiguration.java   |   58 -
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |   47 -
 ...lishedObjectFacetForDomainObjectAnnotation.java |   67 -
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 -
 .../PublishedObjectFacetFromConfiguration.java     |   31 -
 ...atableObjectFacetForDomainObjectAnnotation.java |   73 -
 ...PolicyFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../BookmarkPolicyFacetForDomainObjectXml.java     |   42 -
 ...arkPolicyFacetForViewModelLayoutAnnotation.java |   47 -
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |   55 -
 .../CssClassFaFacetForDomainObjectXml.java         |   44 -
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |   54 -
 ...sClassFacetForDomainObjectLayoutAnnotation.java |   57 -
 .../CssClassFacetForDomainObjectXml.java           |   42 -
 .../CssClassFacetForViewModelLayoutAnnotation.java |   45 -
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  121 --
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  118 --
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../DescribedAsFacetForDomainObjectXml.java        |   42 -
 ...scribedAsFacetForViewModelLayoutAnnotation.java |   47 -
 .../DomainObjectLayoutFacetFactory.java            |  113 --
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  117 --
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  118 --
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |  118 --
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |  117 --
 .../NamedFacetForDomainObjectLayoutAnnotation.java |   47 -
 .../NamedFacetForDomainObjectXml.java              |   44 -
 .../NamedFacetForViewModelLayoutAnnotation.java    |   45 -
 .../PagedFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../PagedFacetForViewModelLayoutAnnotation.java    |   46 -
 ...PluralFacetForDomainObjectLayoutAnnotation.java |   47 -
 .../PluralFacetForDomainObjectXml.java             |   40 -
 .../PluralFacetForViewModelLayoutAnnotation.java   |   47 -
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  135 --
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  135 --
 .../object/domainservice/DomainServiceFacet.java   |   52 -
 .../domainservice/DomainServiceFacetAbstract.java  |   65 -
 .../annotation/DomainServiceFacetAnnotation.java   |   35 -
 .../DomainServiceFacetAnnotationFactory.java       |  153 --
 ...conFacetDerivedFromDomainServiceAnnotation.java |   47 -
 .../DomainServiceLayoutFacet.java                  |   36 -
 .../DomainServiceLayoutFacetAbstract.java          |   54 -
 .../DomainServiceLayoutFacetFactory.java           |   70 -
 ...NamedFacetForDomainServiceLayoutAnnotation.java |   36 -
 .../DomainServiceLayoutFacetAnnotation.java        |   34 -
 .../facets/object/encodeable/EncodableFacet.java   |   42 -
 .../object/encodeable/EncodableFacetAbstract.java  |   85 -
 .../object/encodeable/EncoderDecoderUtil.java      |   36 -
 .../annotcfg/EncodableFacetFromConfiguration.java  |   33 -
 .../encoder/EncodableFacetUsingEncoderDecoder.java |   75 -
 .../facets/object/entity/EntityFacet.java          |   54 -
 .../facets/object/facets/FacetsFacet.java          |   48 -
 .../facets/object/facets/FacetsFacetAbstract.java  |   94 -
 .../facets/annotation/FacetsFacetAnnotation.java   |   32 -
 .../annotation/FacetsFacetAnnotationFactory.java   |   54 -
 .../metamodel/facets/object/grid/GridFacet.java    |   41 -
 .../facets/object/grid/GridFacetDefault.java       |   84 -
 .../facets/object/grid/GridFacetFactory.java       |   46 -
 .../facets/object/hidden/HiddenObjectFacet.java    |   55 -
 .../object/hidden/HiddenObjectFacetAbstract.java   |   50 -
 .../hidden/method/HiddenObjectFacetViaMethod.java  |   65 -
 .../method/HiddenObjectFacetViaMethodFactory.java  |   90 -
 .../metamodel/facets/object/icon/IconFacet.java    |   44 -
 .../facets/object/icon/IconFacetAbstract.java      |   36 -
 .../facets/object/icon/method/IconFacetMethod.java |   52 -
 .../object/icon/method/IconFacetMethodFactory.java |   53 -
 .../RemoveAnnotatedMethodsFacetFactory.java        |   99 --
 ...oveDatanucleusPersistableTypesFacetFactory.java |   67 -
 .../RemoveDnPrefixedMethodsFacetFactory.java       |   46 -
 .../javalang/IteratorFilteringFacetFactory.java    |   55 -
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  132 --
 .../jdo/RemoveJdoEnhancementTypesFacetFactory.java |   66 -
 .../jdo/RemoveJdoPrefixedMethodsFacetFactory.java  |   48 -
 .../facets/object/immutable/ImmutableFacet.java    |   69 -
 .../object/immutable/ImmutableFacetAbstract.java   |   60 -
 .../CopyImmutableFacetOntoMembersFactory.java      |   45 -
 .../facets/object/layout/LayoutFacet.java          |   37 -
 .../facets/object/layout/LayoutFacetAbstract.java  |   41 -
 .../facets/object/layout/LayoutFacetFactory.java   |   56 -
 .../facets/object/layout/LayoutFacetFallback.java  |   43 -
 .../facets/object/layout/LayoutFacetMethod.java    |   54 -
 .../mixin/MetaModelValidatorForMixinTypes.java     |   55 -
 .../metamodel/facets/object/mixin/MixinFacet.java  |   74 -
 .../facets/object/mixin/MixinFacetAbstract.java    |  143 --
 .../mixin/MixinFacetForDomainObjectAnnotation.java |   72 -
 .../object/mixin/MixinFacetForMixinAnnotation.java |   64 -
 .../mixin/MixinFacetForMixinAnnotationFactory.java |   64 -
 .../object/navparent/NavigableParentFacet.java     |   43 -
 .../navparent/NavigableParentFacetAbstract.java    |   36 -
 .../NavigableParentAnnotationFacetFactory.java     |  161 --
 .../method/NavigableParentFacetMethod.java         |   60 -
 .../object/objectspecid/ObjectSpecIdFacet.java     |   33 -
 .../objectspecid/ObjectSpecIdFacetAbstract.java    |   66 -
 .../ObjectSpecIdFacetDerivedFromClassName.java     |   35 -
 ...jectSpecIdFacetDerivedFromClassNameFactory.java |  205 ---
 ...ectSpecIdFacetDerivedFromIoCNamingStrategy.java |   34 -
 .../ObjectSpecIdFacetOnStandaloneList.java         |   31 -
 .../ObjectValidPropertiesFacet.java                |   42 -
 .../ObjectValidPropertiesFacetAbstract.java        |   48 -
 .../impl/ObjectValidPropertiesFacetImpl.java       |   70 -
 .../ObjectValidPropertiesFacetImplFactory.java     |   35 -
 .../metamodel/facets/object/paged/PagedFacet.java  |   31 -
 .../facets/object/paged/PagedFacetAbstract.java    |   50 -
 .../PagedFacetForPagedAnnotationOnType.java        |   34 -
 .../object/parented/ParentedCollectionFacet.java   |   40 -
 .../parented/ParentedCollectionFacetAbstract.java  |   36 -
 .../object/parseable/InvalidEntryException.java    |   42 -
 .../facets/object/parseable/ParseableFacet.java    |   55 -
 .../object/parseable/ParseableFacetAbstract.java   |   90 -
 .../facets/object/parseable/ParserUtil.java        |   46 -
 .../object/parseable/TextEntryParseException.java  |   47 -
 .../annotcfg/ParseableFacetFromConfiguration.java  |   33 -
 .../parser/ParseableFacetUsingParser.java          |  132 --
 .../facets/object/plural/PluralFacet.java          |   41 -
 .../facets/object/plural/PluralFacetAbstract.java  |   41 -
 .../plural/inferred/PluralFacetInferred.java       |   31 -
 .../facets/object/projection/ProjectionFacet.java  |   29 -
 .../object/projection/ProjectionFacetAbstract.java |   42 -
 .../ProjectionFacetFromProjectingProperty.java     |   65 -
 .../CssClassFacetDerivedFromProjectionFacet.java   |   54 -
 .../ident/IconFacetDerivedFromProjectionFacet.java |   52 -
 .../TitleFacetDerivedFromProjectionFacet.java      |   52 -
 .../object/promptStyle/PromptStyleFacet.java       |   33 -
 .../promptStyle/PromptStyleFacetAbstract.java      |   42 -
 .../promptStyle/PromptStyleFacetAsConfigured.java  |   45 -
 .../PromptStyleFacetFallBackToInline.java          |   37 -
 .../publishedobject/PublishedObjectFacet.java      |   30 -
 .../PublishedObjectFacetAbstract.java              |   38 -
 ...etOnCollectionDerivedFromRecreatableObject.java |   46 -
 ...CollectionDerivedFromViewModelFacetFactory.java |   54 -
 ...acetOnPropertyDerivedFromRecreatableObject.java |   48 -
 ...tyDerivedFromRecreatableObjectFacetFactory.java |   52 -
 .../RecreatableObjectFacetAbstract.java            |  129 --
 ...ObjectFacetDeclarativeInitializingAbstract.java |  145 --
 .../recreatable/RecreatableObjectFacetFactory.java |  130 --
 ...ctFacetForRecreatableDomainObjectInterface.java |   46 -
 ...eObjectFacetForRecreatableObjectAnnotation.java |   34 -
 ...leObjectFacetForRecreatableObjectInterface.java |   45 -
 ...creatableObjectFacetForViewModelAnnotation.java |   35 -
 ...ableObjectFacetForXmlRootElementAnnotation.java |   81 -
 .../metamodel/facets/object/recreatable/Util.java  |   33 -
 .../metamodel/facets/object/title/TitleFacet.java  |   55 -
 .../facets/object/title/TitleFacetAbstract.java    |   45 -
 .../annotation/TitleAnnotationFacetFactory.java    |  187 --
 .../annotation/TitleFacetViaTitleAnnotation.java   |  169 --
 .../title/methods/TitleFacetViaMethodsFactory.java |   95 --
 .../title/methods/TitleFacetViaTitleMethod.java    |   93 -
 .../title/methods/TitleFacetViaToStringMethod.java |   70 -
 .../object/title/parser/TitleFacetUsingParser.java |   79 -
 .../validateobject/ValidateObjectFacet.java        |   55 -
 .../ValidateObjectFacetAbstract.java               |   49 -
 .../method/ValidateObjectFacetMethod.java          |   80 -
 .../method/ValidateObjectFacetMethodFactory.java   |   61 -
 .../facets/object/value/EqualByContentFacet.java   |   33 -
 .../object/value/EqualByContentFacetAbstract.java  |   36 -
 .../EqualByContentFacetViaValueSemantics.java      |   30 -
 .../value/ImmutableFacetViaValueSemantics.java     |   39 -
 .../object/value/MaxLengthFacetUsingParser.java    |   58 -
 .../value/TypicalLengthFacetUsingParser.java       |   53 -
 .../metamodel/facets/object/value/ValueFacet.java  |   35 -
 .../facets/object/value/ValueFacetAbstract.java    |  155 --
 .../facets/object/value/ValueFacetSimple.java      |   37 -
 .../value/annotcfg/ValueFacetAnnotation.java       |   81 -
 ...ValueFacetAnnotationOrConfigurationFactory.java |  113 --
 .../annotcfg/ValueFacetFromConfiguration.java      |   38 -
 .../vsp/ValueFacetUsingSemanticsProvider.java      |   41 -
 .../ValueFacetUsingSemanticsProviderFactory.java   |   46 -
 .../ValueSemanticsProviderAndFacetAbstract.java    |  328 ----
 .../value/vsp/ValueSemanticsProviderUtil.java      |   67 -
 .../facets/object/viewmodel/ViewModelFacet.java    |  125 --
 .../facets/object/wizard/WizardFacet.java          |   41 -
 .../facets/object/wizard/WizardFacetAbstract.java  |   36 -
 .../facets/objectvalue/choices/ChoicesFacet.java   |   49 -
 .../objectvalue/choices/ChoicesFacetAbstract.java  |   36 -
 .../objectvalue/fileaccept/FileAcceptFacet.java    |   35 -
 .../fileaccept/FileAcceptFacetAbstract.java        |   37 -
 .../facets/objectvalue/labelat/LabelAtFacet.java   |   36 -
 .../objectvalue/labelat/LabelAtFacetAbstract.java  |   56 -
 .../LabelAtFacetInferredFromMultiLineFacet.java    |   38 -
 .../objectvalue/mandatory/MandatoryFacet.java      |   57 -
 .../mandatory/MandatoryFacetAbstract.java          |  110 --
 .../mandatory/MandatoryFacetDefault.java           |   43 -
 .../facets/objectvalue/maxlen/MaxLengthFacet.java  |   41 -
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |   75 -
 .../objectvalue/multiline/MultiLineFacet.java      |   51 -
 .../multiline/MultiLineFacetAbstract.java          |   63 -
 .../MustSatisfySpecificationFacet.java             |   27 -
 .../MustSatisfySpecificationFacetAbstract.java     |  124 --
 .../mustsatisfyspec/SpecificationEvaluator.java    |   80 -
 .../facets/objectvalue/regex/RegExFacet.java       |   38 -
 .../objectvalue/regex/RegExFacetAbstract.java      |  104 --
 .../renderedadjusted/RenderedAdjustedFacet.java    |   39 -
 .../RenderedAdjustedFacetAbstract.java             |   56 -
 .../objectvalue/typicallen/TypicalLengthFacet.java |   40 -
 .../typicallen/TypicalLengthFacetAbstract.java     |   45 -
 .../ActionParameterAutoCompleteFacet.java          |   48 -
 .../ActionParameterAutoCompleteFacetAbstract.java  |   41 -
 .../facets/param/autocomplete/MinLengthUtil.java   |   56 -
 .../ActionParameterAutoCompleteFacetViaMethod.java |  121 --
 ...ParameterAutoCompleteFacetViaMethodFactory.java |   88 -
 ...ameterFromJavaxValidationAnnotationFactory.java |   56 -
 ...rameterFromJavaxValidationDigitsAnnotation.java |   59 -
 .../facets/param/choices/ActionChoicesFacet.java   |   38 -
 .../param/choices/ActionChoicesFacetAbstract.java  |   36 -
 .../param/choices/ActionParameterChoicesFacet.java |   43 -
 .../ActionParameterChoicesFacetAbstract.java       |   38 -
 .../choices/ActionParameterChoicesFacetNone.java   |   49 -
 ...rameterChoicesFacetDerivedFromChoicesFacet.java |   56 -
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   55 -
 .../method/ActionChoicesFacetViaMethod.java        |  121 --
 .../method/ActionChoicesFacetViaMethodFactory.java |  100 --
 .../ActionParameterChoicesFacetViaMethod.java      |  108 --
 ...ctionParameterChoicesFacetViaMethodFactory.java |   99 --
 .../defaults/ActionParameterDefaultsFacet.java     |   42 -
 .../ActionParameterDefaultsFacetAbstract.java      |   36 -
 ...ParameterDefaultFacetDerivedFromTypeFacets.java |   60 -
 ...arameterDefaultFacetDerivedFromTypeFactory.java |   64 -
 .../ActionParameterDefaultsFacetViaMethod.java     |  118 --
 ...tionParameterDefaultsFacetViaMethodFactory.java |  134 --
 ...ameterAnnotationElseDerivedFromTypeFactory.java |   55 -
 ...DescribedAsFacetOnParameterDerivedFromType.java |   32 -
 .../disable/ActionParameterDisabledFacet.java      |   42 -
 .../ActionParameterDisabledFacetAbstract.java      |   49 -
 .../ActionParameterDisabledFacetViaMethod.java     |   96 --
 ...tionParameterDisabledFacetViaMethodFactory.java |   94 -
 .../param/hide/ActionParameterHiddenFacet.java     |   43 -
 .../hide/ActionParameterHiddenFacetAbstract.java   |   55 -
 .../ActionParameterHiddenFacetViaMethod.java       |   83 -
 ...ActionParameterHiddenFacetViaMethodFactory.java |   91 -
 .../CssClassFacetForParameterLayoutAnnotation.java |   46 -
 ...scribedAsFacetForParameterLayoutAnnotation.java |   46 -
 .../LabelAtFacetForParameterLayoutAnnotation.java  |   47 -
 ...MultiLineFacetForParameterLayoutAnnotation.java |   45 -
 .../NamedFacetForParameterLayoutAnnotation.java    |   51 -
 .../param/layout/ParameterLayoutFacetFactory.java  |   58 -
 ...dAdjustedFacetForParameterLayoutAnnotation.java |   58 -
 ...calLengthFacetForParameterLayoutAnnotation.java |   60 -
 .../MandatoryFacetOnParametersDefaultFactory.java  |   56 -
 .../NamedFacetForParameterUsingReflection.java     |   34 -
 .../ParameterNameFacetFactoryUsingReflection.java  |   74 -
 .../parameter/ParameterAnnotationFacetFactory.java |  134 --
 .../FileAcceptFacetForParameterAnnotation.java     |   47 -
 .../MandatoryFacetForParameterAnnotation.java      |   81 -
 ...cetInvertedByNullableAnnotationOnParameter.java |   59 -
 .../MaxLengthFacetForParameterAnnotation.java      |   46 -
 ...fySpecificationFacetForParameterAnnotation.java |   69 -
 .../regex/RegExFacetForParameterAnnotation.java    |   72 -
 .../RegExFacetForPatternAnnotationOnParameter.java |   66 -
 .../TypicalLengthFacetOnParameterAnnotation.java   |   50 -
 ...picalLengthFacetOnParameterDerivedFromType.java |   49 -
 ...acetOnParameterDerivedFromTypeFacetFactory.java |   56 -
 .../validate/ActionParameterValidationFacet.java   |   45 -
 .../ActionParameterValidationFacetAbstract.java    |   47 -
 .../ActionParameterValidationFacetViaMethod.java   |   84 -
 ...onParameterValidationFacetViaMethodFactory.java |   82 -
 .../PropertyOrCollectionAccessorFacet.java         |   53 -
 .../PropertyOrCollectionAccessorFacetAbstract.java |   57 -
 .../propcoll/notpersisted/NotPersistedFacet.java   |   38 -
 .../notpersisted/NotPersistedFacetAbstract.java    |   36 -
 .../accessor/PropertyAccessorFacetViaAccessor.java |   96 --
 .../PropertyAccessorFacetViaAccessorFactory.java   |  113 --
 .../autocomplete/PropertyAutoCompleteFacet.java    |   51 -
 .../PropertyAutoCompleteFacetAbstract.java         |   39 -
 .../method/PropertyAutoCompleteFacetMethod.java    |  114 --
 .../PropertyAutoCompleteFacetMethodFactory.java    |   79 -
 ...ropertyFromJavaxValidationDigitsAnnotation.java |   60 -
 ...FromJavaxValidationDigitsAnnotationFactory.java |   59 -
 .../properties/businesskey/BusinessKeyFacet.java   |   36 -
 .../businesskey/BusinessKeyFacetAbstract.java      |   36 -
 .../properties/choices/PropertyChoicesFacet.java   |   50 -
 .../choices/PropertyChoicesFacetAbstract.java      |   36 -
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |   52 -
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   45 -
 .../method/PropertyChoicesFacetViaMethod.java      |   93 -
 .../PropertyChoicesFacetViaMethodFactory.java      |   77 -
 .../properties/defaults/PropertyDefaultFacet.java  |   46 -
 .../defaults/PropertyDefaultFacetAbstract.java     |   36 -
 .../defaults/PropertyDefaultFacetNone.java         |   44 -
 ...pertyDefaultFacetDerivedFromDefaultedFacet.java |   57 -
 ...PropertyDefaultFacetDerivedFromTypeFactory.java |   64 -
 .../method/PropertyDefaultFacetViaMethod.java      |   88 -
 .../PropertyDefaultFacetViaMethodFactory.java      |   77 -
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   38 -
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   52 -
 .../inferred/DisabledFacetOnPropertyInferred.java  |   32 -
 .../DisabledFacetOnPropertyInferredFactory.java    |   56 -
 .../MandatoryFacetOnProperyDefaultFactory.java     |   57 -
 .../MultiLineFacetOnPropertyAnnotation.java        |   35 -
 .../properties/projection/ProjectingFacet.java     |   30 -
 .../projection/ProjectingFacetAbstract.java        |   41 -
 .../ProjectingFacetFromPropertyAnnotation.java     |   70 -
 .../property/PropertyAnnotationFacetFactory.java   |  377 ----
 .../command/CommandFacetForPropertyAnnotation.java |   99 --
 ...mandFacetForPropertyAnnotationAsConfigured.java |   37 -
 .../DisabledFacetForPropertyAnnotation.java        |   65 -
 ...acetForPropertyAnnotationInvertedSemantics.java |   32 -
 .../FileAcceptFacetForPropertyAnnotation.java      |   47 -
 .../hidden/HiddenFacetForPropertyAnnotation.java   |   56 -
 .../MandatoryFacetForPropertyAnnotation.java       |   90 -
 ...acetInvertedByNullableAnnotationOnProperty.java |   61 -
 .../MaxLengthFacetForPropertyAnnotation.java       |   46 -
 ...ropertyClearFacetForDomainEventFromDefault.java |   41 -
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 -
 .../property/modify/PropertyDomainEventFacet.java  |   33 -
 .../modify/PropertyDomainEventFacetAbstract.java   |  167 --
 .../modify/PropertyDomainEventFacetDefault.java    |   40 -
 ...pertyDomainEventFacetForPropertyAnnotation.java |   40 -
 ...opertySetterFacetForDomainEventFromDefault.java |   42 -
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 -
 ...tySetterOrClearFacetForDomainEventAbstract.java |  340 ----
 .../facets/properties/property/modify/Utils.java   |   23 -
 ...sfySpecificationFacetForPropertyAnnotation.java |   66 -
 .../NotPersistedFacetForPropertyAnnotation.java    |   46 -
 ...ublishedPropertyFacetForPropertyAnnotation.java |   79 -
 ...ertyFacetForPropertyAnnotationAsConfigured.java |   27 -
 .../PublishedPropertyFacetFromConfiguration.java   |   31 -
 .../RegExFacetForPatternAnnotationOnProperty.java  |   76 -
 .../regex/RegExFacetForPropertyAnnotation.java     |   70 -
 .../CssClassFacetForPropertyLayoutAnnotation.java  |   47 -
 .../CssClassFacetForPropertyXml.java               |   42 -
 ...escribedAsFacetForPropertyLayoutAnnotation.java |   47 -
 .../DescribedAsFacetForPropertyXml.java            |   42 -
 .../HiddenFacetForPropertyLayoutAnnotation.java    |   56 -
 .../propertylayout/HiddenFacetForPropertyXml.java  |   51 -
 .../LabelAtFacetForPropertyLayoutAnnotation.java   |   47 -
 .../propertylayout/LabelAtFacetForPropertyXml.java |   42 -
 .../MultiLineFacetForPropertyLayoutAnnotation.java |   46 -
 .../MultiLineFacetForPropertyXml.java              |   41 -
 .../NamedFacetForPropertyLayoutAnnotation.java     |   51 -
 .../propertylayout/NamedFacetForPropertyXml.java   |   47 -
 ...romptStyleFacetForPropertyLayoutAnnotation.java |   96 --
 .../PromptStyleFacetForPropertyXml.java            |   57 -
 .../propertylayout/PropertyLayoutFacetFactory.java |  194 ---
 ...edAdjustedFacetForPropertyLayoutAnnotation.java |   58 -
 .../RenderedAdjustedFacetForPropertyXml.java       |   45 -
 ...icalLengthFacetForPropertyLayoutAnnotation.java |   60 -
 .../TypicalLengthFacetForPropertyXml.java          |   56 -
 ...UnchangingFacetForPropertyLayoutAnnotation.java |   59 -
 .../UnchangingFacetForPropertyXml.java             |   42 -
 .../properties/publish/PublishedPropertyFacet.java |   29 -
 .../publish/PublishedPropertyFacetAbstract.java    |   38 -
 ...nderedAsDayBeforeFacetAnnotationOnProperty.java |   38 -
 .../renderunchanged/UnchangingFacet.java           |   30 -
 .../renderunchanged/UnchangingFacetAbstract.java   |   36 -
 .../properties/searchable/SearchableFacet.java     |   49 -
 .../searchable/SearchableFacetAbstract.java        |   51 -
 .../TypicalLengthFacetOnPropertyAnnotation.java    |   50 -
 ...ypicalLengthFacetOnPropertyDerivedFromType.java |   49 -
 ...FacetOnPropertyDerivedFromTypeFacetFactory.java |   55 -
 .../update/NotPersistableFacetInferred.java        |   31 -
 .../update/PropertyModifyFacetFactory.java         |   68 -
 .../update/PropertySetAndClearFacetFactory.java    |  122 --
 .../update/clear/PropertyClearFacet.java           |   43 -
 .../update/clear/PropertyClearFacetAbstract.java   |   35 -
 .../clear/PropertyClearFacetViaClearMethod.java    |   74 -
 .../clear/PropertyClearFacetViaSetterMethod.java   |   75 -
 .../update/init/PropertyInitializationFacet.java   |   48 -
 .../init/PropertyInitializationFacetAbstract.java  |   35 -
 ...PropertyInitializationFacetViaSetterMethod.java |   70 -
 .../update/modify/PropertySetterFacet.java         |   49 -
 .../update/modify/PropertySetterFacetAbstract.java |   35 -
 .../modify/PropertySetterFacetViaModifyMethod.java |   81 -
 .../modify/PropertySetterFacetViaSetterMethod.java |   76 -
 .../validating/PropertyValidateFacet.java          |   50 -
 .../validating/PropertyValidateFacetAbstract.java  |   57 -
 .../validating/PropertyValidateFacetNone.java      |   47 -
 .../dflt/PropertyValidateFacetDefault.java         |   49 -
 .../dflt/PropertyValidateFacetDefaultFactory.java  |   58 -
 .../method/PropertyValidateFacetViaMethod.java     |   83 -
 .../PropertyValidateFacetViaMethodFactory.java     |   76 -
 .../DateAndTimeValueSemanticsProviderAbstract.java |  116 --
 .../isis/metamodel/facets/value/JodaFunctions.java |   43 -
 .../ValueSemanticsProviderAbstractTemporal.java    |  373 ----
 .../value/bigdecimal/BigDecimalValueFacet.java     |   60 -
 .../bigdecimal/BigDecimalValueFacetAbstract.java   |   37 -
 ...malValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../BigDecimalValueSemanticsProvider.java          |  143 --
 .../value/biginteger/BigIntegerValueFacet.java     |   26 -
 ...gerValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../BigIntegerValueSemanticsProvider.java          |  110 --
 .../facets/value/blobs/BlobValueFacet.java         |   26 -
 ...lobValueFacetUsingSemanticsProviderFactory.java |   41 -
 .../value/blobs/BlobValueSemanticsProvider.java    |  123 --
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../BooleanPrimitiveValueSemanticsProvider.java    |   55 -
 .../facets/value/booleans/BooleanValueFacet.java   |   29 -
 .../BooleanValueSemanticsProviderAbstract.java     |  129 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../BooleanWrapperValueSemanticsProvider.java      |   69 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../bytes/BytePrimitiveValueSemanticsProvider.java |   52 -
 .../facets/value/bytes/ByteValueFacet.java         |   30 -
 .../bytes/ByteValueSemanticsProviderAbstract.java  |  116 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../bytes/ByteWrapperValueSemanticsProvider.java   |   41 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../chars/CharPrimitiveValueSemanticsProvider.java |   54 -
 .../facets/value/chars/CharValueFacet.java         |   30 -
 .../chars/CharValueSemanticsProviderAbstract.java  |  103 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../chars/CharWrapperValueSemanticsProvider.java   |   41 -
 .../facets/value/clobs/ClobValueFacet.java         |   26 -
 ...lobValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../value/clobs/ClobValueSemanticsProvider.java    |  117 --
 .../facets/value/date/DateValueFacet.java          |   33 -
 .../date/DateValueSemanticsProviderAbstract.java   |  121 --
 .../value/datejdk8local/Jdk8LocalDateUtil.java     |  170 --
 .../datejdk8local/Jdk8LocalDateValueFacet.java     |   33 -
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8LocalDateValueSemanticsProvider.java       |  257 ---
 .../facets/value/datejdk8local/TimeFormatter.java  |   27 -
 .../facets/value/datejdk8local/TimeParser.java     |   27 -
 .../value/datejodalocal/JodaLocalDateUtil.java     |  130 --
 .../datejodalocal/JodaLocalDateValueFacet.java     |   33 -
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaLocalDateValueSemanticsProvider.java       |  257 ---
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../datesql/JavaSqlDateValueSemanticsProvider.java |   98 --
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   |  157 --
 .../Jdk8LocalDateTimeValueFacet.java               |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  275 ---
 .../value/datetimejdk8local/TimeFormatter.java     |   27 -
 .../facets/value/datetimejdk8local/TimeParser.java |   27 -
 .../Jdk8OffsetDateTimeValueFacet.java              |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  |  103 --
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  121 --
 .../value/datetimejoda/JodaDateTimeValueFacet.java |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaDateTimeValueSemanticsProvider.java        |  103 --
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  121 --
 .../datetimejodalocal/JodaLocalDateTimeUtil.java   |  127 --
 .../JodaLocalDateTimeValueFacet.java               |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  259 ---
 ...ateValueFacetUsingSemanticsProviderFactory.java |   46 -
 .../JavaUtilDateValueSemanticsProvider.java        |   85 -
 .../doubles/DoubleFloatingPointValueFacet.java     |   30 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../DoublePrimitiveValueSemanticsProvider.java     |   54 -
 .../DoubleValueSemanticsProviderAbstract.java      |  120 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../DoubleWrapperValueSemanticsProvider.java       |   42 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../FloatPrimitiveValueSemanticsProvider.java      |   54 -
 .../FloatValueSemanticsProviderAbstract.java       |  116 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../floats/FloatWrapperValueSemanticsProvider.java |   41 -
 .../value/floats/FloatingPointValueFacet.java      |   30 -
 .../facets/value/image/ImageValueFacet.java        |   34 -
 ...ageValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../value/image/ImageValueSemanticsProvider.java   |  100 --
 .../image/ImageValueSemanticsProviderAbstract.java |  298 ----
 ...ageValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../JavaAwtImageValueSemanticsProvider.java        |   83 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../IntPrimitiveValueSemanticsProvider.java        |   54 -
 .../integer/IntValueSemanticsProviderAbstract.java |  114 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../integer/IntWrapperValueSemanticsProvider.java  |   41 -
 .../facets/value/integer/IntegerValueFacet.java    |   30 -
 .../localrespath/LocalResourcePathValueFacet.java  |   32 -
 ...athValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../LocalResourcePathValueSemanticsProvider.java   |  130 --
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../longs/LongPrimitiveValueSemanticsProvider.java |   52 -
 .../facets/value/longs/LongValueFacet.java         |   30 -
 .../longs/LongValueSemanticsProviderAbstract.java  |  113 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../longs/LongWrapperValueSemanticsProvider.java   |   41 -
 .../facets/value/markup/MarkupValueFacet.java      |   30 -
 ...kupValueFacetUsingSemanticsProviderFactory.java |   38 -
 .../value/markup/MarkupValueSemanticsProvider.java |  114 --
 .../facets/value/password/PasswordValueFacet.java  |   33 -
 ...ordValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../password/PasswordValueSemanticsProvider.java   |  119 --
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../ShortPrimitiveValueSemanticsProvider.java      |   52 -
 .../facets/value/shortint/ShortValueFacet.java     |   30 -
 .../ShortValueSemanticsProviderAbstract.java       |  115 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../ShortWrapperValueSemanticsProvider.java        |   41 -
 .../facets/value/string/StringValueFacet.java      |   31 -
 ...ingValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../value/string/StringValueSemanticsProvider.java |  126 --
 .../time/TimeValueSemanticsProviderAbstract.java   |  110 --
 .../JodaLocalTimeValueFacetSimpleFactory.java      |   46 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   46 -
 .../timesql/JavaSqlTimeValueSemanticsProvider.java |   95 --
 ...ampValueFacetUsingSemanticsProviderFactory.java |   47 -
 .../JavaSqlTimeStampValueSemanticsProvider.java    |   84 -
 .../TimeStampValueSemanticsProviderAbstract.java   |  101 --
 .../facets/value/treenode/TreeNodeValueFacet.java  |   27 -
 ...odeValueFacetUsingSemanticsProviderFactory.java |   40 -
 .../treenode/TreeNodeValueSemanticsProvider.java   |  136 --
 .../metamodel/facets/value/url/URLValueFacet.java  |   31 -
 ...URLValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../value/url/URLValueSemanticsProvider.java       |  127 --
 .../facets/value/uuid/UUIDValueFacet.java          |   33 -
 ...UIDValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../value/uuid/UUIDValueSemanticsProvider.java     |  112 --
 .../isis/metamodel/interactions/AccessContext.java |   42 -
 .../interactions/ActionArgUsabilityContext.java    |   76 -
 .../interactions/ActionArgValidityContext.java     |   68 -
 .../interactions/ActionArgVisibilityContext.java   |   76 -
 .../interactions/ActionInteractionContext.java     |   31 -
 .../interactions/ActionUsabilityContext.java       |   60 -
 .../interactions/ActionValidityContext.java        |   64 -
 .../interactions/ActionVisibilityContext.java      |   60 -
 .../interactions/CollectionAccessContext.java      |   48 -
 .../interactions/CollectionAddToContext.java       |   56 -
 .../interactions/CollectionRemoveFromContext.java  |   58 -
 .../interactions/CollectionUsabilityContext.java   |   48 -
 .../interactions/CollectionVisibilityContext.java  |   50 -
 .../interactions/DisablingInteractionAdvisor.java  |   46 -
 .../interactions/HidingInteractionAdvisor.java     |   47 -
 .../interactions/InteractionAdvisorFacet.java      |   45 -
 .../metamodel/interactions/InteractionContext.java |  171 --
 .../metamodel/interactions/InteractionUtils.java   |   81 -
 .../metamodel/interactions/ObjectTitleContext.java |   56 -
 .../interactions/ObjectValidityContext.java        |   53 -
 .../interactions/ObjectVisibilityContext.java      |   55 -
 .../metamodel/interactions/ParseValueContext.java  |   59 -
 .../interactions/PropertyAccessContext.java        |   60 -
 .../interactions/PropertyModifyContext.java        |   61 -
 .../interactions/PropertyUsabilityContext.java     |   50 -
 .../interactions/PropertyVisibilityContext.java    |   50 -
 .../metamodel/interactions/ProposedHolder.java     |   38 -
 .../metamodel/interactions/UsabilityContext.java   |   55 -
 .../interactions/ValidatingInteractionAdvisor.java |   51 -
 .../metamodel/interactions/ValidityContext.java    |   42 -
 .../metamodel/interactions/VisibilityContext.java  |   54 -
 .../isis/metamodel/layout/DeweyOrderSet.java       |  404 -----
 .../MemberIdentifierComparator.java                |   44 -
 .../memberorderfacet/MemberOrderComparator.java    |   90 -
 .../MemberOrderFacetComparator.java                |   56 -
 .../OrderSetGroupNameComparator.java               |   55 -
 .../metamodel/objectmanager/ObjectManager.java     |  107 --
 .../objectmanager/ObjectManagerDefault.java        |   77 -
 .../objectmanager/create/ObjectCreator.java        |   82 -
 .../create/ObjectCreator_builtinHandlers.java      |  386 -----
 .../objectmanager/identify/ObjectIdentifier.java   |   63 -
 .../identify/ObjectIdentifier_builtinHandlers.java |  139 --
 .../metamodel/objectmanager/load/ObjectLoader.java |   80 -
 .../load/ObjectLoader_builtinHandlers.java         |  259 ---
 .../objectmanager/refresh/ObjectRefresher.java     |   67 -
 .../refresh/ObjectRefresher_builtinHandlers.java   |  107 --
 ...arameterChoicesFacetFromParentedCollection.java |   76 -
 ...meterDefaultsFacetFromAssociatedCollection.java |   64 -
 .../param/DeriveFacetsPostProcessor.java           |  633 -------
 .../ObjectSpecificationPostProcessor.java          |   28 -
 .../isis/metamodel/progmodel/ProgrammingModel.java |  179 --
 .../progmodel/ProgrammingModelAbstract.java        |  253 ---
 .../progmodel/ProgrammingModelInitFilter.java      |   81 -
 .../ProgrammingModelInitFilterDefault.java         |   86 -
 .../progmodel/ProgrammingModelService.java         |   32 -
 .../dflt/ProgrammingModelFacetsJava8.java          |  388 -----
 .../isis/metamodel/services/CollectionHelper.java  |  100 --
 .../metamodel/services/ServiceInjectorDefault.java |   75 -
 .../metamodel/services/ServiceInjectorLegacy.java  |  286 ----
 .../isis/metamodel/services/ServiceUtil.java       |   41 -
 .../services/appfeat/ApplicationFeature.java       |  324 ----
 .../appfeat/ApplicationFeatureFactory.java         |   45 -
 .../services/appfeat/ApplicationFeatureId.java     |  492 ------
 .../ApplicationFeatureRepositoryDefault.java       |  555 ------
 .../services/appfeat/ApplicationFeatureType.java   |  102 --
 .../classsubstitutor/ClassSubstitutor.java         |   28 -
 .../classsubstitutor/ClassSubstitutorAbstract.java |  137 --
 .../classsubstitutor/ClassSubstitutorDefault.java  |   76 -
 .../ClassSubstitutorForCollections.java            |   66 -
 .../classsubstitutor/ClassSubstitutorRegistry.java |   80 -
 .../command/CommandDtoServiceInternal.java         |   72 -
 .../services/container/query/QueryCardinality.java |   31 -
 .../metamodel/services/devutils/MemberType.java    |   25 -
 .../services/events/MetamodelEventService.java     |   94 -
 .../events/MetamodelEventSupport_Spring.java       |   77 -
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   88 -
 .../services/grid/GridLoaderServiceDefault.java    |  257 ---
 .../services/grid/GridReaderUsingJaxb.java         |   76 -
 .../services/grid/GridServiceDefault.java          |  209 ---
 .../services/grid/GridSystemServiceAbstract.java   |  699 --------
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  674 --------
 .../services/homepage/HomePageAction.java          |   64 -
 .../services/homepage/HomePageResolverService.java |   35 -
 .../metamodel/services/homepage/package-info.java  |   26 -
 .../ixn/InteractionDtoServiceInternal.java         |   52 -
 .../services/layout/LayoutServiceDefault.java      |  147 --
 .../services/message/MessageServiceNoop.java       |   88 -
 .../services/metamodel/DomainMemberDefault.java    |  301 ----
 .../services/metamodel/DomainModelDefault.java     |   58 -
 .../services/metamodel/MetaModelExportSupport.java |   31 -
 .../services/metamodel/MetaModelExporter.java      |  570 -------
 .../metamodel/MetaModelServiceDefault.java         |  272 ---
 .../isis/metamodel/services/metamodel/Util.java    |   35 -
 .../publishing/PublisherDispatchService.java       |   46 -
 .../services/registry/ServiceRegistryDefault.java  |  103 --
 .../services/registry/SpringContextProvider.java   |   23 -
 .../services/title/TitleServiceDefault.java        |   83 -
 .../title/TitlesAndTranslationsValidator.java      |  166 --
 .../services/user/UserServiceDefault.java          |  177 --
 .../org/apache/isis/metamodel/spec/ActionType.java |   41 -
 .../isis/metamodel/spec/DefaultProvider.java       |   31 -
 .../org/apache/isis/metamodel/spec/Described.java  |   35 -
 .../isis/metamodel/spec/DomainModelException.java  |   47 -
 .../spec/ElementSpecificationProvider.java         |   44 -
 .../apache/isis/metamodel/spec/EntityState.java    |   49 -
 .../isis/metamodel/spec/FreeStandingList.java      |   96 --
 .../apache/isis/metamodel/spec/Hierarchical.java   |   65 -
 .../metamodel/spec/InjectorMethodEvaluator.java    |   31 -
 .../apache/isis/metamodel/spec/ManagedObject.java  |  734 --------
 .../spec/ObjectInstantiationException.java         |   41 -
 .../apache/isis/metamodel/spec/ObjectSpecId.java   |   62 -
 .../isis/metamodel/spec/ObjectSpecification.java   |  444 -----
 .../spec/ObjectSpecificationException.java         |   36 -
 .../apache/isis/metamodel/spec/Specification.java  |   50 -
 .../isis/metamodel/spec/feature/Contributed.java   |   31 -
 .../isis/metamodel/spec/feature/CurrentHolder.java |   46 -
 .../spec/feature/MutableCurrentHolder.java         |   64 -
 .../isis/metamodel/spec/feature/ObjectAction.java  |  589 -------
 .../spec/feature/ObjectActionContainer.java        |   80 -
 .../spec/feature/ObjectActionParameter.java        |  235 ---
 .../metamodel/spec/feature/ObjectAssociation.java  |  253 ---
 .../spec/feature/ObjectAssociationContainer.java   |   72 -
 .../isis/metamodel/spec/feature/ObjectFeature.java |   79 -
 .../isis/metamodel/spec/feature/ObjectMember.java  |  227 ---
 .../spec/feature/OneToManyActionParameter.java     |   28 -
 .../spec/feature/OneToManyAssociation.java         |  101 --
 .../metamodel/spec/feature/OneToManyFeature.java   |   40 -
 .../spec/feature/OneToOneActionParameter.java      |   28 -
 .../spec/feature/OneToOneAssociation.java          |   53 -
 .../metamodel/spec/feature/OneToOneFeature.java    |   28 -
 .../isis/metamodel/specloader/CollectionUtils.java |   61 -
 .../specloader/InjectorMethodEvaluatorDefault.java |   91 -
 .../specloader/ProgrammingModelServiceDefault.java |  104 --
 .../specloader/ReflectiveActionException.java      |   43 -
 .../specloader/SpecificationCacheDefault.java      |  134 --
 .../metamodel/specloader/SpecificationLoader.java  |  137 --
 .../specloader/SpecificationLoaderDefault.java     |  521 ------
 .../SpecificationLoaderDefault_debug.java          |   79 -
 .../specloader/classsubstitutor/ProxyEnhanced.java |   28 -
 .../specloader/facetprocessor/FacetProcessor.java  |  486 ------
 .../isis/metamodel/specloader/package-info.java    |   43 -
 .../specloader/postprocessor/PostProcessor.java    |   59 -
 .../specloader/specimpl/ContributeeMember.java     |   67 -
 .../specloader/specimpl/FacetedMethodsBuilder.java |  614 -------
 .../metamodel/specloader/specimpl/Factories.java   |   96 --
 .../specloader/specimpl/IntrospectionState.java    |   47 -
 .../specloader/specimpl/MixedInMember.java         |   40 -
 .../specimpl/ObjectActionContributee.java          |  253 ---
 .../specloader/specimpl/ObjectActionDefault.java   |  688 --------
 .../specloader/specimpl/ObjectActionMixedIn.java   |  260 ---
 .../specimpl/ObjectActionParameterAbstract.java    |  492 ------
 .../specimpl/ObjectActionParameterContributee.java |   25 -
 .../ObjectActionParameterContributeeAbstract.java  |   94 -
 .../specimpl/ObjectActionParameterMixedIn.java     |   25 -
 .../ObjectActionParameterMixedInAbstract.java      |   85 -
 .../specimpl/ObjectAssociationAbstract.java        |   97 --
 .../specloader/specimpl/ObjectMemberAbstract.java  |  409 -----
 .../specimpl/ObjectSpecificationAbstract.java      | 1118 ------------
 .../OneToManyActionParameterContributee.java       |   43 -
 .../specimpl/OneToManyActionParameterDefault.java  |   43 -
 .../specimpl/OneToManyActionParameterMixedIn.java  |   40 -
 .../specimpl/OneToManyAssociationContributee.java  |  192 ---
 .../specimpl/OneToManyAssociationDefault.java      |  288 ----
 .../specimpl/OneToManyAssociationMixedIn.java      |  221 ---
 .../OneToOneActionParameterContributee.java        |   38 -
 .../specimpl/OneToOneActionParameterDefault.java   |   37 -
 .../specimpl/OneToOneActionParameterMixedIn.java   |   35 -
 .../specimpl/OneToOneAssociationContributee.java   |  175 --
 .../specimpl/OneToOneAssociationDefault.java       |  361 ----
 .../specimpl/OneToOneAssociationMixedIn.java       |  207 ---
 .../metamodel/specloader/specimpl/Predicates.java  |  168 --
 .../isis/metamodel/specloader/specimpl/Utils.java  |  103 --
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  456 -----
 .../CollectionFacetOnStandaloneList.java           |   73 -
 .../DescribedAsFacetOnStandaloneList.java          |   31 -
 .../standalonelist/NamedFacetOnStandaloneList.java |   31 -
 .../ObjectSpecificationOnStandaloneList.java       |  186 --
 .../PluralFacetOnStandaloneList.java               |   31 -
 .../traverser/TypeExtractorAbstract.java           |   84 -
 .../traverser/TypeExtractorMethodParameters.java   |   60 -
 .../traverser/TypeExtractorMethodReturn.java       |   47 -
 .../validator/MetaModelInvalidException.java       |   33 -
 .../specloader/validator/MetaModelValidator.java   |   44 -
 .../validator/MetaModelValidatorAbstract.java      |   69 -
 ...etaModelValidatorForConflictingOptionality.java |   62 -
 .../MetaModelValidatorForDeprecatedAbstract.java   |   68 -
 .../MetaModelValidatorForDeprecatedAnnotation.java |   54 -
 ...etaModelValidatorForDeprecatedMethodPrefix.java |   52 -
 .../MetaModelValidatorForValidationFailures.java   |   23 -
 .../validator/MetaModelValidatorVisiting.java      |  111 --
 .../specloader/validator/ValidationFailure.java    |   61 -
 .../specloader/validator/ValidationFailures.java   |  112 --
 .../isis/metamodel/util/DeweyOrderComparator.java  |   37 -
 .../org/apache/isis/metamodel/util/EventUtil.java  |   43 -
 .../isis/metamodel/util/pchain/ParentChain.java    |   83 -
 .../metamodel/util/pchain/ParentChainDefault.java  |   49 -
 .../isis/metamodel/util/snapshot/Helper.java       |   91 -
 .../isis/metamodel/util/snapshot/IsisSchema.java   |  181 --
 .../apache/isis/metamodel/util/snapshot/Place.java |   65 -
 .../isis/metamodel/util/snapshot/XmlSchema.java    |  648 -------
 .../isis/metamodel/util/snapshot/XmlSnapshot.java  |  916 ----------
 .../isis/metamodel/util/snapshot/XsMetaModel.java  |  337 ----
 .../metamodel/valuetypes/ValueTypeDefinition.java  |   45 -
 .../metamodel/valuetypes/ValueTypeProvider.java    |   34 -
 .../valuetypes/ValueTypeProviderDefault.java       |   55 -
 .../ValueTypeProviderForCollections.java           |   56 -
 .../metamodel/valuetypes/ValueTypeRegistry.java    |   96 --
 .../metamodel/MetaModelContext_configTest.java     |   77 +
 .../metamodel/MetaModelContext_forTesting.java     |  256 +++
 .../core/metamodel/ServiceInjector_forTesting.java |   70 +
 .../core/metamodel/ServiceRegistry_forTesting.java |  154 ++
 .../oid/CollectionOidTest_valueSemantics.java      |   47 +
 .../adapter/oid/OidMarshallerTest_marshall.java    |   50 +
 .../oid/OidMarshallerTest_roundtripping.java       |   59 +
 .../adapter/oid/OidMarshallerTest_unmarshal.java   |  154 ++
 .../core/metamodel/adapter/oid/OidVersionTest.java |   70 +
 ...dDefaultTest_valueSemantics_whenPersistent.java |   45 +
 ...idDefaultTest_valueSemantics_whenTransient.java |   46 +
 .../metamodel/adapter/oid/RootOidTest_create.java  |   62 +
 .../core/metamodel/commons/IoUtils_CopyTest.java   |  136 ++
 .../commons/JavaClassUtilsTest_getBuiltIn.java     |   41 +
 .../metamodel/commons/ListUtilsTest_adjust.java    |   67 +
 .../metamodel/commons/ListUtilsTest_insert.java    |   84 +
 .../commons/ListUtilsTest_mutableCopy.java         |   89 +
 .../core/metamodel/commons/LocaleUtilsTest.java    |   36 +
 .../isis/core/metamodel/commons/NameUtilTest.java  |   68 +
 .../isis/core/metamodel/commons/PrintLocale.java   |   59 +
 .../commons/StringUtilsTest_enumTitle.java         |   41 +
 .../commons/StringUtils_NaturalNameTest.java       |   59 +
 .../commons/StringUtils_NaturalizeTest.java        |   49 +
 .../commons/StringUtils_NormalizedTest.java        |   65 +
 .../StringUtils_RemoveLeadingWhiteSpace.java       |   51 +
 .../commons/StringUtils_SplitOnCommas.java         |   80 +
 .../commons/StringUtils_StripLeadingSlashTest.java |   49 +
 .../commons/StringUtils_StripNewLinesTest.java     |   59 +
 .../commons/StringUtils_camelLowerFirst.java       |   38 +
 .../commons/StringUtils_toLineSeparated.java       |   52 +
 .../commons/StringUtils_toLowerDashed.java         |   36 +
 .../metamodel/commons/TypesTest_filteredList.java  |   71 +
 .../metamodel/commons/matchers/IsisMatchers.java   |   73 +
 .../matchers/IsisMatchers_NonEmptyStringTest.java  |   53 +
 .../metamodel/consent/InteractionResultTest.java   |   85 +
 .../core/metamodel/facetapi/FacetAbstractTest.java |   76 +
 .../facetapi/FeatureTypeTest_identifierFor.java    |   85 +
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |  159 ++
 .../metamodel/facets/AbstractFacetFactoryTest.java |  169 ++
 .../core/metamodel/facets/AnnotationsTest.java     |   71 +
 .../Annotations_getAnnotations_on_Class_Test.java  |  248 +++
 .../Annotations_getAnnotations_on_Field_Test.java  |  203 +++
 .../Annotations_getAnnotations_on_Method_Test.java |  184 ++
 ...notations_getAnnotations_on_Parameter_Test.java |  200 +++
 .../core/metamodel/facets/CollectionUtilsTest.java |  123 ++
 ...nEventHelperTest_newActionInteractionEvent.java |   87 +
 ...HelperTest_newCollectionDomainEvent_forAdd.java |   84 +
 ...perTest_newCollectionDomainEvent_forRemove.java |   84 +
 ...HelperTest_newPropertyDomainEvent_forClear.java |   76 +
 ...elperTest_newPropertyDomainEvent_forModify.java |   72 +
 .../metamodel/facets/MethodFinderUtilsTest.java    |   72 +
 .../metamodel/facets/MethodRemoverForTesting.java  |   81 +
 .../metamodel/facets/ObjectAdapterUtilsTest.java   |   84 +
 .../apache/isis/core/metamodel/facets/Utils.java   |   64 +
 .../actions/ActionMethodsFacetFactoryTest.java     |  539 ++++++
 .../actions/IteratorFilteringFacetFactoryTest.java |   91 +
 .../action/ActionAnnotationFacetFactoryTest.java   |  118 ++
 ...nnotationFacetFactoryTest_ActionInvocation.java |  234 +++
 .../ActionAnnotationFacetFactoryTest_Command.java  |  313 ++++
 .../ActionAnnotationFacetFactoryTest_Hidden.java   |   72 +
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  211 +++
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  313 ++++
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |  109 ++
 ...ActionAnnotationFacetFactoryTest_Semantics.java |  111 ++
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |  177 ++
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   73 +
 .../PrototypeFacetAnnotationFactoryTest.java       |   77 +
 ...kmarkableAnnotationFacetFactoryTest_action.java |   63 +
 .../HomePageAnnotationFacetFactoryTest.java        |   66 +
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |  407 +++++
 ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java |  197 +++
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  222 +++
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  223 +++
 .../prototype/PrototypeFacetAbstractTest.java      |   58 +
 .../CollectionFieldMethodsFacetFactoryTest.java    |  589 +++++++
 .../collections/JavaCollectionFacetTest.java       |   90 +
 .../CollectionAnnotationFacetFactoryTest.java      |  570 +++++++
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |  137 ++
 ...bledAnnotationOnCollectionFacetFactoryTest.java |   82 +
 ...stedAnnotationOnCollectionFacetFactoryTest.java |   71 +
 ...etForCollectionLayoutAnnotationFactoryTest.java |   86 +
 .../cssclassfa/CssClassFaFacetAbstractTest.java    |   45 +
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  240 +++
 ...okmarkableAnnotationFacetFactoryTest_class.java |   63 +
 .../callback/CreatedCallbackFacetFactoryTest.java  |   67 +
 .../callback/DeleteCallbackFacetFactoryTest.java   |   88 +
 .../callback/LoadCallbackFacetFactoryTest.java     |   88 +
 .../PersistAndSaveCallbackFacetFactoryTest.java    |  109 ++
 .../callback/PersistCallbackFacetFactoryTest.java  |   88 +
 .../RemoveAndDeleteCallbackFacetFactoryTest.java   |  109 ++
 .../callback/RemoveCallbackFacetFactoryTest.java   |   88 +
 .../callback/SaveCallbackFacetFactoryTest.java     |   88 +
 .../callback/UpdateCallbackFacetFactoryTest.java   |   88 +
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |   68 +
 .../object/defaults/DefaultedFacetFactoryTest.java |  228 +++
 .../ObjectDisabledMethodFacetFactoryTest.java      |   72 +
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   60 +
 .../DomainObjectAnnotationFacetFactoryTest.java    |  861 ++++++++++
 .../ObjectTypeAnnotationFacetFactoryTest.java      |   65 +
 .../DomainObjectLayoutFactoryTest.java             |  670 ++++++++
 .../DomainServiceFacetAnnotationFactoryTest.java   |   66 +
 .../DomainServiceLayoutFacetFactoryTest.java       |  123 ++
 .../facets/FacetsFacetAnnotationFactoryTest.java   |  153 ++
 .../hidden/ObjectHiddenMethodFacetFactoryTest.java |   85 +
 .../cssclass/CssClassFacetMethodFactoryTest.java   |   71 +
 .../ident/cssclass/CssClassFacetMethodTest.java    |   85 +
 .../CssClassFacetMethodWithProblemTest.java        |   84 +
 .../ident/icon/IconFacetMethodFactoryTest.java     |   71 +
 .../object/ident/icon/IconFacetMethodTest.java     |   84 +
 .../ident/layout/LayoutFacetFactoryTest.java       |   71 +
 .../object/ident/layout/LayoutFacetMethodTest.java |   84 +
 .../ident/title/TitleFacetViaMethodTest.java       |   97 ++
 .../title/TitleFacetViaMethodsFactoryTest.java     |  112 ++
 .../TitleAnnotationFacetFactoryTest.java           |  262 +++
 .../TitleFacetViaTitleAnnotationTest.java          |  153 ++
 .../object/layoutxml/GridFacetDefaultTest.java     |   60 +
 .../navparent/NavigableParentFacetMethodTest.java  |   84 +
 .../NavigableParentAnnotationFacetFactoryTest.java |  113 ++
 .../annotation/NavigableParentTestSamples.java     |   68 +
 ...SpecIdFacetDerivedFromClassNameFactoryTest.java |   63 +
 .../parseable/ParseableFacetUsingParserTest.java   |  131 ++
 .../facets/object/parseable/ValueProxy.java        |   23 +
 .../RecreatableObjectFacetFactoryTest.java         |   68 +
 .../ObjectValidMethodFacetFactoryTest.java         |   66 +
 ...eFacetAnnotationOrConfigurationFactoryTest.java |  504 ++++++
 .../ordering/memberorder/DeweyOrderSetTest.java    |  265 +++
 .../MemberOrderAnnotationFacetFactoryTest.java     |  143 ++
 .../memberorder/MemberOrderComparatorTest.java     |  181 ++
 ...cetForParameterLayoutAnnotationFactoryTest.java |   58 +
 ...cetForParameterLayoutAnnotationFactoryTest.java |   79 +
 .../ParameterAnnotationFacetFactoryTest.java       |  388 +++++
 ...lableAnnotationOnParameterFacetFactoryTest.java |  106 ++
 ...RegExAnnotationOnParameterFacetFactoryTest.java |   79 +
 .../PropertyMethodsFacetFactoryTest.java           |  671 ++++++++
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  185 ++
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |  102 ++
 .../MandatoryAnnotationFacetFactoryTest.java       |   71 +
 ...sistedAnnotationOnPropertyFacetFactoryTest.java |   71 +
 .../PropertyAnnotationFacetFactoryTest.java        |  868 ++++++++++
 ...llableAnnotationOnPropertyFacetFactoryTest.java |  118 ++
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |   90 +
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   68 +
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   95 ++
 ...ValidationDigitsAnnotationFacetFactoryTest.java |   79 +
 .../DomainObjectWithMustSatisfyAnnotations.java    |   48 +
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   48 +
 .../SpecificationAlwaysSatisfied.java              |   31 +
 .../specification/SpecificationAndTests.java       |  111 ++
 .../specification/SpecificationNeverSatisfied.java |   31 +
 .../specification/SpecificationNotTests.java       |   62 +
 .../specification/SpecificationOrTests.java        |  110 ++
 ...cificationRequiresFirstLetterToBeUpperCase.java |   39 +
 .../BigDecimalValueSemanticsProviderTest.java      |   89 +
 .../value/BigIntValueSemanticsProviderTest.java    |   88 +
 .../value/BlobValueSemanticsProviderTest.java      |   65 +
 .../value/BooleanValueSemanticsProviderTest.java   |  113 ++
 .../value/ByteValueSemanticsProviderTest.java      |   86 +
 .../value/CharacterValueSemanticsProviderTest.java |   79 +
 .../value/ClobValueSemanticsProviderTest.java      |   65 +
 .../value/DoubleValueSemanticsProviderTest.java    |   84 +
 .../value/FloatValueSemanticsProviderTest.java     |   93 +
 .../ImageValueSemanticsProviderAbstractTest.java   |  126 ++
 .../value/IntValueSemanticsProviderTest.java       |   80 +
 .../JavaSqlDateValueSemanticsProviderTest.java     |   91 +
 .../JavaSqlTimeValueSemanticsProviderTest.java     |   90 +
 .../JavaUtilDateValueSemanticsProviderTest.java    |   96 ++
 .../value/LongValueSemanticsProviderTest.java      |   91 +
 .../value/PasswordValueSemanticsProviderTest.java  |   49 +
 .../value/ShortValueSemanticsProviderTest.java     |   87 +
 .../value/StringValueSemanticsProviderTest.java    |   80 +
 .../core/metamodel/facets/value/TestClock.java     |   69 +
 .../ValueSemanticsProviderAbstractTestCase.java    |  165 ++
 ...odaLocalDateTimeValueSemanticsProviderTest.java |   81 +
 ...jectAssociationPredicatesTest_visibleWhere.java |  150 ++
 .../interactions/InteractionUtils_isA_Test.java    |  104 ++
 .../ServiceInjectorDefaultTest_usingFields.java    |  144 ++
 ...erviceInjectorDefaultTest_validateServices.java |   81 +
 ...InjectorDefaultTest_validateServices_happy.java |   89 +
 .../services/ServiceInjectorLegacyTest.java        |  166 ++
 .../services/appfeat/ApplicationFeatureIdTest.java |  691 ++++++++
 .../ApplicationFeatureRepositoryDefaultTest.java   |  323 ++++
 .../services/appfeat/ApplicationFeatureTest.java   |  163 ++
 .../appfeat/ApplicationFeatureTypeTest.java        |  191 +++
 ...eptionRecognizerDocDefault_recognizes_Test.java |   57 +
 .../core/metamodel/services/grid/BS3GridTest.java  |  165 ++
 .../isis/core/metamodel/services/grid/Foo.java     |   22 +
 .../metamodel/services/grid/Foo.layout.xml         |    0
 .../isis/core/metamodel/services/grid/Foo2.java    |   22 +
 .../services/grid/Foo2.layout.fallback.xml         |    0
 .../isis/core/metamodel/services/grid/Foo3.java    |   22 +
 .../services/grid/Foo3.layout.fallback.xml         |    0
 .../metamodel/services/grid/Foo3.layout.xml        |    0
 .../isis/core/metamodel/services/grid/Foo4.java    |   22 +
 ...dLoaderServiceDefault_resourceNameFor_Test.java |   58 +
 .../services/menubars/BS3MenuBarsTest.java         |   62 +
 .../metamodel/MetaModelServiceDefaultTest.java     |  242 +++
 .../spec/ObjectSpecIdTest_constructor.java         |   43 +
 .../spec/ObjectSpecIdTest_valueSemantics.java      |   38 +
 .../metamodel/specloader/ReflectorTestPojo.java    |   52 +
 .../specloader/SpecificationCacheDefaultTest.java  |  120 ++
 .../SpecificationLoaderTestAbstract.java           |  185 ++
 .../specloader/SpecificationLoaderTest_array.java  |   65 +
 .../SpecificationLoaderTest_collection.java        |   67 +
 .../specloader/SpecificationLoaderTest_value.java  |   46 +
 .../ClassSubstitutorTest_getClass.java             |   69 +
 .../IntrospectionState_comparable_Test.java        |   87 +
 .../specimpl/ObjectActionMixedInTest.java          |   64 +
 ...ionParameterAbstractTest_getId_and_getName.java |  214 +++
 .../specimpl/ObjectAssociationAbstractTest.java    |  211 +++
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  229 +++
 .../specimpl/ObjectMemberAbstractTest.java         |   43 +
 .../testspec/ObjectSpecificationStub.java          |  358 ++++
 .../metamodel/MetaModelContext_configTest.java     |   77 -
 .../metamodel/MetaModelContext_forTesting.java     |  256 ---
 .../isis/metamodel/ServiceInjector_forTesting.java |   70 -
 .../isis/metamodel/ServiceRegistry_forTesting.java |  154 --
 .../oid/CollectionOidTest_valueSemantics.java      |   47 -
 .../adapter/oid/OidMarshallerTest_marshall.java    |   51 -
 .../oid/OidMarshallerTest_roundtripping.java       |   60 -
 .../adapter/oid/OidMarshallerTest_unmarshal.java   |  154 --
 .../isis/metamodel/adapter/oid/OidVersionTest.java |   71 -
 ...dDefaultTest_valueSemantics_whenPersistent.java |   45 -
 ...idDefaultTest_valueSemantics_whenTransient.java |   46 -
 .../metamodel/adapter/oid/RootOidTest_create.java  |   63 -
 .../isis/metamodel/commons/IoUtils_CopyTest.java   |  136 --
 .../commons/JavaClassUtilsTest_getBuiltIn.java     |   41 -
 .../metamodel/commons/ListUtilsTest_adjust.java    |   67 -
 .../metamodel/commons/ListUtilsTest_insert.java    |   84 -
 .../commons/ListUtilsTest_mutableCopy.java         |   89 -
 .../isis/metamodel/commons/LocaleUtilsTest.java    |   36 -
 .../isis/metamodel/commons/NameUtilTest.java       |   68 -
 .../apache/isis/metamodel/commons/PrintLocale.java |   59 -
 .../commons/StringUtilsTest_enumTitle.java         |   41 -
 .../commons/StringUtils_NaturalNameTest.java       |   59 -
 .../commons/StringUtils_NaturalizeTest.java        |   49 -
 .../commons/StringUtils_NormalizedTest.java        |   65 -
 .../StringUtils_RemoveLeadingWhiteSpace.java       |   51 -
 .../commons/StringUtils_SplitOnCommas.java         |   80 -
 .../commons/StringUtils_StripLeadingSlashTest.java |   49 -
 .../commons/StringUtils_StripNewLinesTest.java     |   59 -
 .../commons/StringUtils_camelLowerFirst.java       |   38 -
 .../commons/StringUtils_toLineSeparated.java       |   52 -
 .../commons/StringUtils_toLowerDashed.java         |   36 -
 .../metamodel/commons/TypesTest_filteredList.java  |   71 -
 .../metamodel/commons/matchers/IsisMatchers.java   |   73 -
 .../matchers/IsisMatchers_NonEmptyStringTest.java  |   53 -
 .../metamodel/consent/InteractionResultTest.java   |   85 -
 .../isis/metamodel/facetapi/FacetAbstractTest.java |   76 -
 .../facetapi/FeatureTypeTest_identifierFor.java    |   85 -
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |  159 --
 .../metamodel/facets/AbstractFacetFactoryTest.java |  169 --
 .../isis/metamodel/facets/AnnotationsTest.java     |   71 -
 .../Annotations_getAnnotations_on_Class_Test.java  |  248 ---
 .../Annotations_getAnnotations_on_Field_Test.java  |  203 ---
 .../Annotations_getAnnotations_on_Method_Test.java |  184 --
 ...notations_getAnnotations_on_Parameter_Test.java |  200 ---
 .../isis/metamodel/facets/CollectionUtilsTest.java |  123 --
 ...nEventHelperTest_newActionInteractionEvent.java |   87 -
 ...HelperTest_newCollectionDomainEvent_forAdd.java |   84 -
 ...perTest_newCollectionDomainEvent_forRemove.java |   84 -
 ...HelperTest_newPropertyDomainEvent_forClear.java |   76 -
 ...elperTest_newPropertyDomainEvent_forModify.java |   72 -
 .../metamodel/facets/MethodFinderUtilsTest.java    |   72 -
 .../metamodel/facets/MethodRemoverForTesting.java  |   81 -
 .../metamodel/facets/ObjectAdapterUtilsTest.java   |   84 -
 .../org/apache/isis/metamodel/facets/Utils.java    |   64 -
 .../actions/ActionMethodsFacetFactoryTest.java     |  538 ------
 .../actions/IteratorFilteringFacetFactoryTest.java |   91 -
 .../action/ActionAnnotationFacetFactoryTest.java   |  118 --
 ...nnotationFacetFactoryTest_ActionInvocation.java |  234 ---
 .../ActionAnnotationFacetFactoryTest_Command.java  |  313 ----
 .../ActionAnnotationFacetFactoryTest_Hidden.java   |   72 -
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  211 ---
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  313 ----
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |  109 --
 ...ActionAnnotationFacetFactoryTest_Semantics.java |  111 --
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |  177 --
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   73 -
 .../PrototypeFacetAnnotationFactoryTest.java       |   77 -
 ...kmarkableAnnotationFacetFactoryTest_action.java |   63 -
 .../HomePageAnnotationFacetFactoryTest.java        |   66 -
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |  407 -----
 ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java |  197 ---
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  222 ---
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  223 ---
 .../prototype/PrototypeFacetAbstractTest.java      |   58 -
 .../CollectionFieldMethodsFacetFactoryTest.java    |  589 -------
 .../collections/JavaCollectionFacetTest.java       |   90 -
 .../CollectionAnnotationFacetFactoryTest.java      |  572 -------
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |  137 --
 ...bledAnnotationOnCollectionFacetFactoryTest.java |   82 -
 ...stedAnnotationOnCollectionFacetFactoryTest.java |   71 -
 ...etForCollectionLayoutAnnotationFactoryTest.java |   86 -
 .../cssclassfa/CssClassFaFacetAbstractTest.java    |   45 -
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  240 ---
 ...okmarkableAnnotationFacetFactoryTest_class.java |   63 -
 .../callback/CreatedCallbackFacetFactoryTest.java  |   67 -
 .../callback/DeleteCallbackFacetFactoryTest.java   |   88 -
 .../callback/LoadCallbackFacetFactoryTest.java     |   88 -
 .../PersistAndSaveCallbackFacetFactoryTest.java    |  109 --
 .../callback/PersistCallbackFacetFactoryTest.java  |   88 -
 .../RemoveAndDeleteCallbackFacetFactoryTest.java   |  109 --
 .../callback/RemoveCallbackFacetFactoryTest.java   |   88 -
 .../callback/SaveCallbackFacetFactoryTest.java     |   88 -
 .../callback/UpdateCallbackFacetFactoryTest.java   |   88 -
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |   68 -
 .../object/defaults/DefaultedFacetFactoryTest.java |  228 ---
 .../ObjectDisabledMethodFacetFactoryTest.java      |   72 -
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   60 -
 .../DomainObjectAnnotationFacetFactoryTest.java    |  861 ----------
 .../ObjectTypeAnnotationFacetFactoryTest.java      |   65 -
 .../DomainObjectLayoutFactoryTest.java             |  670 --------
 .../DomainServiceFacetAnnotationFactoryTest.java   |   66 -
 .../DomainServiceLayoutFacetFactoryTest.java       |  123 --
 .../facets/FacetsFacetAnnotationFactoryTest.java   |  153 --
 .../hidden/ObjectHiddenMethodFacetFactoryTest.java |   85 -
 .../cssclass/CssClassFacetMethodFactoryTest.java   |   71 -
 .../ident/cssclass/CssClassFacetMethodTest.java    |   85 -
 .../CssClassFacetMethodWithProblemTest.java        |   84 -
 .../ident/icon/IconFacetMethodFactoryTest.java     |   71 -
 .../object/ident/icon/IconFacetMethodTest.java     |   84 -
 .../ident/layout/LayoutFacetFactoryTest.java       |   71 -
 .../object/ident/layout/LayoutFacetMethodTest.java |   84 -
 .../ident/title/TitleFacetViaMethodTest.java       |   97 --
 .../title/TitleFacetViaMethodsFactoryTest.java     |  112 --
 .../TitleAnnotationFacetFactoryTest.java           |  263 ---
 .../TitleFacetViaTitleAnnotationTest.java          |  154 --
 .../object/layoutxml/GridFacetDefaultTest.java     |   60 -
 .../navparent/NavigableParentFacetMethodTest.java  |   84 -
 .../NavigableParentAnnotationFacetFactoryTest.java |  113 --
 .../annotation/NavigableParentTestSamples.java     |   68 -
 ...SpecIdFacetDerivedFromClassNameFactoryTest.java |   67 -
 .../parseable/ParseableFacetUsingParserTest.java   |  131 --
 .../facets/object/parseable/ValueProxy.java        |   23 -
 .../RecreatableObjectFacetFactoryTest.java         |   68 -
 .../ObjectValidMethodFacetFactoryTest.java         |   66 -
 ...eFacetAnnotationOrConfigurationFactoryTest.java |  504 ------
 .../ordering/memberorder/DeweyOrderSetTest.java    |  265 ---
 .../MemberOrderAnnotationFacetFactoryTest.java     |  143 --
 .../memberorder/MemberOrderComparatorTest.java     |  181 --
 ...cetForParameterLayoutAnnotationFactoryTest.java |   58 -
 ...cetForParameterLayoutAnnotationFactoryTest.java |   79 -
 .../ParameterAnnotationFacetFactoryTest.java       |  388 -----
 ...lableAnnotationOnParameterFacetFactoryTest.java |  106 --
 ...RegExAnnotationOnParameterFacetFactoryTest.java |   79 -
 .../PropertyMethodsFacetFactoryTest.java           |  671 --------
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  185 --
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |  102 --
 .../MandatoryAnnotationFacetFactoryTest.java       |   71 -
 ...sistedAnnotationOnPropertyFacetFactoryTest.java |   71 -
 .../PropertyAnnotationFacetFactoryTest.java        |  869 ----------
 ...llableAnnotationOnPropertyFacetFactoryTest.java |  118 --
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |   90 -
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   68 -
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   95 --
 ...ValidationDigitsAnnotationFacetFactoryTest.java |   80 -
 .../DomainObjectWithMustSatisfyAnnotations.java    |   48 -
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   48 -
 .../SpecificationAlwaysSatisfied.java              |   31 -
 .../specification/SpecificationAndTests.java       |  111 --
 .../specification/SpecificationNeverSatisfied.java |   31 -
 .../specification/SpecificationNotTests.java       |   62 -
 .../specification/SpecificationOrTests.java        |  110 --
 ...cificationRequiresFirstLetterToBeUpperCase.java |   39 -
 .../BigDecimalValueSemanticsProviderTest.java      |   89 -
 .../value/BigIntValueSemanticsProviderTest.java    |   88 -
 .../value/BlobValueSemanticsProviderTest.java      |   65 -
 .../value/BooleanValueSemanticsProviderTest.java   |  113 --
 .../value/ByteValueSemanticsProviderTest.java      |   86 -
 .../value/CharacterValueSemanticsProviderTest.java |   79 -
 .../value/ClobValueSemanticsProviderTest.java      |   65 -
 .../value/DoubleValueSemanticsProviderTest.java    |   84 -
 .../value/FloatValueSemanticsProviderTest.java     |   93 -
 .../ImageValueSemanticsProviderAbstractTest.java   |  126 --
 .../value/IntValueSemanticsProviderTest.java       |   80 -
 .../JavaSqlDateValueSemanticsProviderTest.java     |   91 -
 .../JavaSqlTimeValueSemanticsProviderTest.java     |   90 -
 .../JavaUtilDateValueSemanticsProviderTest.java    |   96 --
 .../value/LongValueSemanticsProviderTest.java      |   91 -
 .../value/PasswordValueSemanticsProviderTest.java  |   49 -
 .../value/ShortValueSemanticsProviderTest.java     |   87 -
 .../value/StringValueSemanticsProviderTest.java    |   80 -
 .../isis/metamodel/facets/value/TestClock.java     |   69 -
 .../ValueSemanticsProviderAbstractTestCase.java    |  165 --
 ...odaLocalDateTimeValueSemanticsProviderTest.java |   81 -
 ...jectAssociationPredicatesTest_visibleWhere.java |  150 --
 .../interactions/InteractionUtils_isA_Test.java    |  104 --
 .../ServiceInjectorDefaultTest_usingFields.java    |  144 --
 ...erviceInjectorDefaultTest_validateServices.java |   81 -
 ...InjectorDefaultTest_validateServices_happy.java |   89 -
 .../services/ServiceInjectorLegacyTest.java        |  166 --
 .../services/appfeat/ApplicationFeatureIdTest.java |  691 --------
 .../ApplicationFeatureRepositoryDefaultTest.java   |  323 ----
 .../services/appfeat/ApplicationFeatureTest.java   |  163 --
 .../appfeat/ApplicationFeatureTypeTest.java        |  191 ---
 ...eptionRecognizerDocDefault_recognizes_Test.java |   57 -
 .../isis/metamodel/services/grid/BS3GridTest.java  |  165 --
 .../apache/isis/metamodel/services/grid/Foo.java   |   22 -
 .../apache/isis/metamodel/services/grid/Foo2.java  |   22 -
 .../apache/isis/metamodel/services/grid/Foo3.java  |   22 -
 .../apache/isis/metamodel/services/grid/Foo4.java  |   22 -
 ...dLoaderServiceDefault_resourceNameFor_Test.java |   58 -
 .../services/menubars/BS3MenuBarsTest.java         |   62 -
 .../metamodel/MetaModelServiceDefaultTest.java     |  242 ---
 .../spec/ObjectSpecIdTest_constructor.java         |   43 -
 .../spec/ObjectSpecIdTest_valueSemantics.java      |   38 -
 .../metamodel/specloader/ReflectorTestPojo.java    |   52 -
 .../specloader/SpecificationCacheDefaultTest.java  |  120 --
 .../SpecificationLoaderTestAbstract.java           |  185 --
 .../specloader/SpecificationLoaderTest_array.java  |   65 -
 .../SpecificationLoaderTest_collection.java        |   67 -
 .../specloader/SpecificationLoaderTest_value.java  |   46 -
 .../ClassSubstitutorTest_getClass.java             |   69 -
 .../IntrospectionState_comparable_Test.java        |   91 -
 .../specimpl/ObjectActionMixedInTest.java          |   64 -
 ...ionParameterAbstractTest_getId_and_getName.java |  214 ---
 .../specimpl/ObjectAssociationAbstractTest.java    |  211 ---
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  229 ---
 .../specimpl/ObjectMemberAbstractTest.java         |   43 -
 .../testspec/ObjectSpecificationStub.java          |  358 ----
 .../dom/CustomerAsProxiedByDataNucleus.java        |    2 +-
 .../services/menubars/menubars.layout.xml          |    0
 core/persistence/jdo/applib/pom.xml                |   99 --
 .../applib/exceptions/NotPersistableException.java |   43 -
 .../exceptions/UnsupportedFindException.java       |   42 -
 core/persistence/jdo/datanucleus-5/pom.xml         |  150 --
 .../CreateSchemaObjectFromClassMetadata.java       |  219 ---
 .../datanucleus/DataNucleusContextUtil.java        |   59 -
 .../datanucleus/DataNucleusException.java          |   43 -
 .../datanucleus/JDOStateManagerForIsis.java        |  255 ---
 .../datanucleus/metamodel/JdoPropertyUtils.java    |   81 -
 .../commands/AbstractDataNucleusObjectCommand.java |   41 -
 .../commands/DataNucleusCreateObjectCommand.java   |   72 -
 .../commands/DataNucleusDeleteObjectCommand.java   |   50 -
 .../PersistenceQueryFindAllInstancesProcessor.java |   58 -
 ...sistenceQueryFindUsingApplibQueryProcessor.java |  159 --
 .../queries/PersistenceQueryProcessor.java         |   30 -
 .../queries/PersistenceQueryProcessorAbstract.java |   79 -
 .../datanucleus/persistence/queries/QueryUtil.java |   91 -
 .../persistence/spi/JdoObjectIdSerializer.java     |  207 ---
 .../service/JdoPersistenceLifecycleService.java    |  149 --
 .../entities/JdoEntityTypeRegistry.java            |   94 -
 ...eptionRecognizerCompositeForJdoObjectStore.java |   78 -
 .../exceprecog/JdoNestedExceptionResolver.java     |   45 -
 .../datanucleus5/jdosupport/IsisJdoSupportDN5.java |  223 ---
 .../mixins/Persistable_downloadJdoMetadata.java    |   88 -
 .../datanucleus5/metamodel/JdoMetamodelUtil.java   |   63 -
 .../metamodel/JdoProgrammingModelPlugin.java       |  299 ----
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |   59 -
 .../JdoDatastoreIdentityFacet.java                 |   34 -
 .../JdoDatastoreIdentityFacetAbstract.java         |   54 -
 .../JdoDatastoreIdentityFacetAnnotation.java       |   32 -
 .../JdoDatastoreIdentityFacetImpl.java             |   32 -
 .../JdoDiscriminatorAnnotationFacetFactory.java    |   96 --
 .../discriminator/JdoDiscriminatorFacet.java       |   25 -
 .../JdoDiscriminatorFacetDefault.java              |   30 -
 ...nferredFromJdoDiscriminatorValueAnnotation.java |   35 -
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |   51 -
 ...doPersistenceCapableAnnotationFacetFactory.java |   84 -
 .../JdoPersistenceCapableFacet.java                |   45 -
 .../JdoPersistenceCapableFacetAbstract.java        |   87 -
 .../JdoPersistenceCapableFacetAnnotation.java      |   36 -
 .../JdoPersistenceCapableFacetImpl.java            |  135 --
 .../facets/object/query/JdoNamedQuery.java         |  112 --
 .../object/query/JdoQueriesFacetAnnotation.java    |   36 -
 .../query/JdoQueryAnnotationFacetFactory.java      |   99 --
 .../facets/object/query/JdoQueryFacet.java         |   59 -
 .../facets/object/query/JdoQueryFacetAbstract.java |   64 -
 .../object/query/JdoQueryFacetAnnotation.java      |   36 -
 .../object/query/VisitorForClauseAbstract.java     |  109 --
 .../facets/object/query/VisitorForFromClause.java  |   67 -
 .../object/query/VisitorForVariablesClause.java    |   68 -
 .../version/JdoVersionAnnotationFacetFactory.java  |  103 --
 .../facets/object/version/JdoVersionFacet.java     |   25 -
 .../version/JdoVersionFacetFromAnnotation.java     |   30 -
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  180 --
 .../BigDecimalFacetDerivedFromJdoColumn.java       |   59 -
 .../prop/column/BigDecimalFacetFallback.java       |   47 -
 .../column/MandatoryFacetDerivedFromJdoColumn.java |   36 -
 ...ndatoryFacetInferredFromAbsenceOfJdoColumn.java |   35 -
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |  215 ---
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  155 --
 .../column/MaxLengthFacetDerivedFromJdoColumn.java |   31 -
 .../JdoNotPersistentAnnotationFacetFactory.java    |   61 -
 .../prop/notpersistent/JdoNotPersistentFacet.java  |   35 -
 .../JdoNotPersistentFacetAbstract.java             |   37 -
 .../JdoNotPersistentFacetAnnotation.java           |   30 -
 .../notpersistent/JdoNotPersistentFacetImpl.java   |   30 -
 ...FacetDerivedFromJdoNotPersistentAnnotation.java |   31 -
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |   35 -
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |   61 -
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |   35 -
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |   37 -
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |   30 -
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |   30 -
 ...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java |   43 -
 .../util/JdoPrimaryKeyPropertyPredicate.java       |   48 -
 .../objectadapter/ObjectAdapterContext.java        |  256 ---
 .../ObjectAdapterContext_DependencyInjection.java  |   67 -
 .../ObjectAdapterContext_Factories.java            |   81 -
 ...ObjectAdapterContext_LifecycleEventSupport.java |   70 -
 .../ObjectAdapterContext_NewIdentifier.java        |   64 -
 ...ctAdapterContext_ObjectAdapterByIdProvider.java |  222 ---
 ...ObjectAdapterContext_ObjectAdapterProvider.java |   65 -
 .../ObjectAdapterContext_ObjectCreation.java       |  150 --
 .../DataNucleusApplicationComponents5.java         |  243 ---
 .../persistence/IsisLifecycleListener.java         |  194 ---
 .../persistence/IsisPersistenceSessionJdo.java     |   83 -
 .../persistence/IsisPersistenceSessionJdoBase.java |  262 ---
 .../persistence/IsisTransactionJdo.java            |  469 -----
 .../persistence/IsisTransactionManagerJdo.java     |  334 ----
 .../persistence/PersistenceSession5.java           |  872 ----------
 .../persistence/PersistenceSessionFactory5.java    |  233 ---
 .../persistence/command/PersistenceCommand.java    |   28 -
 .../command/PersistenceCommandAbstract.java        |   39 -
 .../persistence/query/PersistenceQuery.java        |   46 -
 .../query/PersistenceQueryAbstract.java            |  101 --
 .../persistence/query/PersistenceQueryFactory.java |   86 -
 .../query/PersistenceQueryFindAllInstances.java    |   63 -
 ...ersistenceQueryFindUsingApplibQueryDefault.java |   85 -
 .../ObjectReflectorDefaultTest_object.java         |   81 -
 ...onRecognizerCompositeForJdoObjectStoreTest.java |   89 -
 ...atastoreIdentityAnnotationFacetFactoryTest.java |  116 --
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |  117 --
 ...rsistenceCapableAnnotationFacetFactoryTest.java |  148 --
 .../JdoVersionAnnotationFacetFactoryTest.java      |   91 -
 ...AnnotationFacetFactoryTest_refineMetaModel.java |  275 ---
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  114 --
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  141 --
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |  125 --
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |  137 --
 .../adapterfactory/pojo/PojoAdapterTest.java       |   81 -
 .../transaction/PojoAdapterBuilder.java            |  160 --
 .../runtime/system/ObjectMemberAbstractTest.java   |  240 ---
 .../WrapperFactoryDefault_wrappedObject_Test.java  |  464 -----
 ...actoryDefault_wrappedObject_transient_Test.java |  284 ----
 core/pom.xml                                       |   49 +-
 core/runtime/pom.xml                               |    4 +-
 .../org/apache/isis/runtime/IsisModuleRuntime.java |    2 +-
 .../apache/isis/runtime/context/IsisContext.java   |    4 +-
 .../runtime/context/session/RuntimeContext.java    |    8 +-
 .../context/session/RuntimeContextBase.java        |   10 +-
 .../session/RuntimeEventSupport_Spring.java        |    2 +-
 .../persistence/adapter/ObjectAdapterForBean.java  |   12 +-
 .../runtime/persistence/adapter/PojoAdapter.java   |   18 +-
 .../persistence/session/PersistenceSession.java    |   12 +-
 .../session/PersistenceSessionFactory.java         |    2 +-
 .../events/PersistenceEventService_Spring.java     |    2 +-
 .../transaction/AdapterAndProperty.java            |    8 +-
 .../transaction/AuditerDispatchService.java        |    6 +-
 .../transaction/ChangedObjectsService.java         |   14 +-
 .../transaction/IsisTransactionAspectSupport.java  |    4 +-
 .../transaction/IsisTransactionFlushException.java |    2 +-
 .../IsisTransactionManagerException.java           |    2 +-
 .../apache/isis/runtime/session/IsisSession.java   |    6 +-
 .../runtime/session/IsisSessionFactoryDefault.java |   16 +-
 .../session/init/InitialisationSession.java        |    2 +-
 .../session/init/IsisLocaleInitializer.java        |    2 +-
 .../session/init/IsisTimeZoneInitializer.java      |    2 +-
 .../system/ObjectActionLayoutXmlDefaultTest.java   |   14 +-
 .../system/OneToManyAssociationDefaultTest.java    |   22 +-
 .../system/TypeExtractorMethodReturnTest.java      |    2 +-
 .../system/TypeExtractorMethodsParametersTest.java |    2 +-
 core/runtimeservices/pom.xml                       |    2 +-
 .../runtimeservices/InitialisationException.java   |    2 +-
 .../runtimeservices/IsisModuleRuntimeServices.java |    4 +-
 .../isis/runtimeservices/ServiceException.java     |    2 +-
 .../auth/AuthenticationSessionProviderDefault.java |    2 +-
 .../background/BackgroundCommandExecution.java     |    2 +-
 .../bookmarks/BookmarkServiceInternalDefault.java  |   20 +-
 .../command/CommandDtoServiceInternalDefault.java  |   16 +-
 .../command/CommandExecutorServiceDefault.java     |   22 +-
 .../confmenu/ConfigurationViewServiceDefault.java  |   14 +-
 .../runtimeservices/email/EmailServiceDefault.java |    4 +-
 .../isis/runtimeservices/error/EmailTicket.java    |    2 +-
 .../isis/runtimeservices/error/SimpleTicket.java   |    4 +-
 .../factory/FactoryServiceDefault.java             |   14 +-
 .../homepage/HomePageResolverServiceDefault.java   |   30 +-
 .../apache/isis/runtimeservices/i18n/po/Block.java |    2 +-
 .../isis/runtimeservices/i18n/po/PoReader.java     |   10 +-
 .../isis/runtimeservices/i18n/po/PoWriter.java     |    4 +-
 .../i18n/po/TranslationServicePo.java              |    8 +-
 .../ixn/InteractionDtoServiceInternalDefault.java  |   13 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |    6 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   36 +-
 .../menubars/bootstrap3/ServiceAndAction.java      |    4 +-
 .../publish/PublishedObjectsDefault.java           |   12 +-
 .../publish/PublisherDispatchServiceDefault.java   |    8 +-
 .../repository/RepositoryServiceDefault.java       |   10 +-
 .../routing/RoutingServiceDefault.java             |    2 +-
 .../userreg/EmailNotificationServiceDefault.java   |    2 +-
 .../runtimeservices/wrapper/AsyncWrapDefault.java  |    2 +-
 .../wrapper/WrapperFactoryDefault.java             |    8 +-
 .../InteractionEventDispatcherTypeSafe.java        |    2 +-
 .../AbstractCollectionInvocationHandler.java       |    4 +-
 .../handlers/CollectionInvocationHandler.java      |    4 +-
 .../DelegatingInvocationHandlerDefault.java        |    8 +-
 .../handlers/DomainObjectInvocationHandler.java    |   50 +-
 .../wrapper/handlers/MapInvocationHandler.java     |    4 +-
 .../wrapper/handlers/ProxyContextHandler.java      |    4 +-
 .../wrapper/internal/util/MethodPrefixFinder.java  |   26 +-
 .../wrapper/proxy/ProxyCreator.java                |   10 +-
 .../xactn/TransactionServiceSpring.java            |    2 +-
 .../xmlsnapshot/XmlSnapshotBuilder.java            |   10 +-
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |    6 +-
 .../email/EmailServiceDefaultTest_actually.java    |    2 +-
 .../isis/runtimeservices/i18n/po/PoReaderTest.java |    4 +-
 .../wrapper/WrapperFactoryDefaultTest.java         |    2 +-
 core/schema/pom.xml                                |  175 --
 core/security/api/pom.xml                          |   83 -
 .../api/authentication/AuthenticationRequest.java  |   61 -
 .../AuthenticationRequestAbstract.java             |   55 -
 .../api/authentication/AuthenticationSession.java  |   99 --
 .../AuthenticationSessionAbstract.java             |  170 --
 .../security/api/authentication/MessageBroker.java |  105 --
 .../AuthenticationRequestLogonFixture.java         |   49 -
 .../authentication/health/HealthAuthSession.java   |   45 -
 .../manager/AuthenticationManager.java             |  173 --
 .../singleuser/SingleUserSession.java              |   61 -
 .../standard/NoAuthenticatorException.java         |   46 -
 .../api/authentication/standard/SimpleSession.java |   92 -
 .../standard/AuthorizationConstants.java           |   34 -
 .../isis/security/EncodabilityContractTest.java    |   94 -
 .../SimpleSessionEncodabilityNoRolesTest.java      |   38 -
 .../SimpleSessionEncodabilityWithRolesTest.java    |   38 -
 core/security/bypass/pom.xml                       |   48 -
 core/security/keycloak/pom.xml                     |   81 -
 .../keycloak/webmodule/WebModuleKeycloak.java      |   72 -
 core/security/pom.xml                              |   83 +
 core/security/shiro/pom.xml                        |   96 --
 .../shiro/authentication/AuthenticatorShiro.java   |  227 ---
 .../shiro/authorization/IsisPermission.java        |  137 --
 .../PermissionToRoleMapperFromString.java          |   37 -
 .../isis/security/shiro/permrolemapper/Util.java   |   61 -
 .../security/shiro/webmodule/WebModuleShiro.java   |  192 ---
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  116 --
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  114 --
 .../PermissionToRoleMapperFromIniTest.java         |   45 -
 .../PermissionToRoleMapperFromStringTest.java      |   45 -
 core/security/{shiro => }/src/main/doc/antora.yml  |    0
 .../configure-isis-to-use-bypass.PNG               |  Bin
 .../shiro => src/main/doc/modules/api}/nav.adoc    |    0
 .../src/main/doc/modules/api/pages/about.adoc      |    0
 .../main/doc/modules/api/partials/module-nav.adoc  |    0
 .../isis/security/api/IsisModuleSecurityApi.java   |    0
 .../api/authentication/AuthenticationRequest.java  |   61 +
 .../AuthenticationRequestAbstract.java             |   55 +
 .../AuthenticationRequestPassword.java             |    0
 .../api/authentication/AuthenticationSession.java  |   99 ++
 .../AuthenticationSessionAbstract.java             |  170 ++
 .../AuthenticationSessionProvider.java             |    0
 .../security/api/authentication/MessageBroker.java |  105 ++
 .../AuthenticationRequestLogonFixture.java         |   49 +
 .../authentication/health/HealthAuthSession.java   |   45 +
 .../manager/AuthenticationManager.java             |  173 ++
 .../manager/RegistrationDetails.java               |    0
 .../AuthenticationRequestSingleUser.java           |    0
 .../singleuser/SingleUserSession.java              |   61 +
 .../api/authentication/standard/Authenticator.java |    0
 .../standard/AuthenticatorAbstract.java            |    0
 .../standard/NoAuthenticatorException.java         |   46 +
 .../standard/RandomCodeGenerator.java              |    0
 .../standard/RandomCodeGeneratorDefault.java       |    0
 .../api/authentication/standard/Registrar.java     |    0
 .../standard/RegistrationDetailsPassword.java      |    0
 .../api/authentication/standard/SimpleSession.java |   92 +
 .../manager/AuthorizationManager.java              |    0
 .../standard/AuthorizationConstants.java           |   32 +
 .../api/authorization/standard/Authorizor.java     |    0
 .../isis/security/EncodabilityContractTest.java    |   94 +
 .../AuthenticationManager_authenticators_Test.java |    0
 .../standard/AuthenticatorDefaultTest.java         |    0
 .../SimpleSessionEncodabilityNoRolesTest.java      |   38 +
 .../SimpleSessionEncodabilityTestAbstract.java     |    0
 .../SimpleSessionEncodabilityWithRolesTest.java    |   38 +
 ...rdAuthenticationManager_AuthenticationTest.java |    0
 core/testsupport/integtestsupport/pom.xml          |  197 ---
 .../ExceptionRecognizerTranslate.java              |   75 -
 .../IsisIntegrationTestAbstract.java               |  133 --
 .../isis/integtestsupport/ThrowableMatchers.java   |   51 -
 .../validate/ValidateDomainModel.java              |  121 --
 core/testsupport/unittestsupport/pom.xml           |  218 ---
 .../AbstractApplyToAllContractTest.java            |   95 --
 ...irectionalRelationshipContractTestAbstract.java |  804 ---------
 .../comparable/ComparableContractTester.java       |   82 -
 .../unittestsupport/config/internal/_Config.java   |  119 --
 .../config/internal/_Config_Instance.java          |  193 ---
 .../config/internal/_Config_LifecycleResource.java |   98 --
 .../config/internal/_Config_Parsers.java           |  117 --
 .../config/internal/_Config_trim.java              |   49 -
 ...rviceMethodMustBeFinalContractTestAbstract.java |   78 -
 .../isis/unittestsupport/jaxb/JaxbMatchers.java    |  128 --
 .../jmocking/ImposteriserUsingCodegenPlugin.java   |   92 -
 .../jmocking/JUnitRuleMockery2.java                |  317 ----
 .../unittestsupport/soap/PublishedEndpoints.java   |   57 -
 .../soap/SoapEndpointPublishingRule.java           |   87 -
 .../sortedsets/SortedSetsContractTestAbstract.java |   71 -
 .../isis/unittestsupport/utils/ReflectUtils.java   |   69 -
 core/{schema => unittestsupport}/.gitignore        |    0
 core/unittestsupport/pom.xml                       |  217 +++
 .../unittestsupport/src/main/doc/antora.yml        |    0
 .../main/doc/modules/unit-test-support/nav.adoc    |    0
 .../doc/modules/unit-test-support/pages/about.adoc |    0
 .../pages/unit-test-support/contract-tests.adoc    |    0
 .../pages/unit-test-support/jmock-extensions.adoc  |    0
 .../unit-test-support/maven-configuration.adoc     |    0
 .../soap-fake-server-junit-rule.adoc               |    0
 .../unit-test-support/partials/module-nav.adoc     |    0
 .../AbstractApplyToAllContractTest.java            |   95 ++
 ...irectionalRelationshipContractTestAbstract.java |  804 +++++++++
 .../apache/isis/unittestsupport/bidir/Child.java   |    0
 .../isis/unittestsupport/bidir/Instantiator.java   |    0
 .../unittestsupport/bidir/InstantiatorMap.java     |    0
 .../unittestsupport/bidir/InstantiatorSimple.java  |    0
 .../isis/unittestsupport/bidir/Instantiators.java  |    0
 .../apache/isis/unittestsupport/bidir/Parent.java  |    0
 .../ComparableContractTest_compareTo.java          |    0
 .../comparable/ComparableContractTester.java       |   82 +
 .../config/IsisConfigurationLegacy.java            |    0
 .../unittestsupport/config/internal/_Config.java   |  119 ++
 .../config/internal/_Config_Instance.java          |  193 +++
 .../config/internal/_Config_LifecycleResource.java |   98 ++
 .../config/internal/_Config_Parsers.java           |  117 ++
 .../config/internal/_Config_trim.java              |   49 +
 .../apache/isis/unittestsupport/files/Files.java   |    0
 ...rviceMethodMustBeFinalContractTestAbstract.java |   78 +
 .../isis/unittestsupport/jaxb/JaxbMatchers.java    |  128 ++
 .../jmocking/ImposteriserUsingCodegenPlugin.java   |   92 +
 .../unittestsupport/jmocking/Imposterisers.java    |    0
 .../jmocking/InjectIntoJMockAction.java            |    0
 .../isis/unittestsupport/jmocking/IsisActions.java |    0
 .../unittestsupport/jmocking/JMockActions.java     |    0
 .../jmocking/JUnitRuleMockery2.java                |  317 ++++
 .../unittestsupport/jmocking/MyMockomatic.java     |    0
 .../unittestsupport/jmocking/PostponedAction.java  |    0
 .../unittestsupport/soap/PublishedEndpoints.java   |   57 +
 .../isis/unittestsupport/soap/SoapEndpoint.java    |    0
 .../soap/SoapEndpointPublishingRule.java           |   87 +
 .../unittestsupport/soap/SoapEndpointSpec.java     |    0
 .../sortedsets/SortedSetsContractTestAbstract.java |   71 +
 .../unittestsupport/streams/NullPrintStream.java   |    0
 .../isis/unittestsupport/utils/CollectUtils.java   |    0
 .../isis/unittestsupport/utils/IndentPrinter.java  |    0
 .../isis/unittestsupport/utils/ReflectUtils.java   |   69 +
 .../isis/unittestsupport/utils/StringUtils.java    |    0
 .../value/ValueTypeContractTestAbstract.java       |    0
 core/viewers/restfulobjects/applib/pom.xml         |   77 -
 .../restfulobjects/applib/JsonRepresentation.java  | 1798 --------------------
 .../restfulobjects/applib/RestfulResponse.java     |  370 ----
 .../restfulobjects/applib/util/MediaTypes.java     |   73 -
 .../viewer/restfulobjects/applib/util/Parser.java  |  387 -----
 .../restfulobjects/applib/util/PathNode.java       |  188 --
 .../applib/util/UrlEncodingUtils.java              |   81 -
 .../viewer/restfulobjects/applib/JsonFixture.java  |   44 -
 .../JsonRepresentationTest_asInputStream.java      |   56 -
 .../restfulobjects/jaxrs-resteasy-4/pom.xml        |  133 --
 .../webmodule/WebModuleJaxrsResteasy4.java         |  128 --
 core/viewers/restfulobjects/rendering/pom.xml      |   60 -
 .../restfulobjects/rendering/IResourceContext.java |   99 --
 .../restfulobjects/rendering/LinkFollowSpecs.java  |  127 --
 .../viewer/restfulobjects/rendering/OidUtils.java  |   68 -
 .../rendering/ReprRendererAbstract.java            |  215 ---
 .../AbstractObjectMemberReprRenderer.java          |  319 ----
 .../domainobjects/ActionResultReprRenderer.java    |  207 ---
 .../domainobjects/CollectionSemantics.java         |   46 -
 .../domainobjects/DomainObjectLinkTo.java          |   99 --
 .../domainobjects/DomainObjectReprRenderer.java    |  473 -----
 .../domainobjects/DomainServiceLinkTo.java         |   58 -
 .../rendering/domainobjects/JsonValueEncoder.java  |  255 ---
 .../domainobjects/JsonValueEncoder_Converters.java |  681 --------
 .../rendering/domainobjects/ListReprRenderer.java  |  130 --
 .../rendering/domainobjects/MemberType.java        |  153 --
 .../rendering/domainobjects/MutatorSpec.java       |   51 -
 .../domainobjects/ObjectActionReprRenderer.java    |  239 ---
 .../domainobjects/ObjectAdapterLinkTo.java         |   41 -
 .../rendering/domainobjects/ObjectAndAction.java   |   30 -
 .../domainobjects/ObjectAndActionInvocation.java   |  106 --
 .../domainobjects/ObjectAndCollection.java         |   30 -
 .../domainobjects/ObjectAndCollection2.java        |   39 -
 .../rendering/domainobjects/ObjectAndMember.java   |   41 -
 .../rendering/domainobjects/ObjectAndProperty.java |   30 -
 .../domainobjects/ObjectAndProperty2.java          |   40 -
 .../ObjectCollectionReprRenderer.java              |  194 ---
 .../domainobjects/ObjectPropertyReprRenderer.java  |  256 ---
 .../domainobjects/ScalarValueReprRenderer.java     |   87 -
 .../AbstractTypeFeatureReprRenderer.java           |  108 --
 .../AbstractTypeMemberReprRenderer.java            |   79 -
 .../domaintypes/ActionDescriptionReprRenderer.java |   90 -
 .../ActionParameterDescriptionReprRenderer.java    |  104 --
 .../CollectionDescriptionReprRenderer.java         |   63 -
 .../domaintypes/DomainTypeReprRenderer.java        |  187 --
 .../domaintypes/ObjectSpecAndSuperSpec.java        |   41 -
 .../rendering/domaintypes/ParentSpecAndAction.java |   30 -
 .../domaintypes/ParentSpecAndActionParam.java      |   30 -
 .../domaintypes/ParentSpecAndCollection.java       |   30 -
 .../domaintypes/ParentSpecAndFeature.java          |   42 -
 .../domaintypes/ParentSpecAndProperty.java         |   30 -
 .../PropertyDescriptionReprRenderer.java           |   73 -
 .../domaintypes/TypeActionResultReprRenderer.java  |   73 -
 .../domaintypes/TypeListReprRenderer.java          |   67 -
 .../rendering/service/RepresentationService.java   |   85 -
 .../RepresentationServiceContentNegotiator.java    |  162 --
 .../acceptheader/AcceptHeaderServiceForRest.java   |  103 --
 .../service/conneg/ContentNegotiationService.java  |   51 -
 .../conneg/ContentNegotiationServiceAbstract.java  |  160 --
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  413 -----
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |  426 -----
 .../ContentNegotiationServiceXRoDomainType.java    |  165 --
 .../service/swagger/SwaggerServiceDefault.java     |   61 -
 .../service/swagger/SwaggerServiceMenu.java        |  162 --
 .../service/swagger/internal/ClassExcluder.java    |    9 -
 .../swagger/internal/ClassExcluderAbstract.java    |   65 -
 .../service/swagger/internal/Generation.java       |  863 ----------
 .../swagger/internal/SwaggerSpecGenerator.java     |   87 -
 .../rendering/service/swagger/internal/Util.java   |  173 --
 .../internal/ValuePropertyFactoryDefault.java      |  148 --
 .../swagger/internal/ValuePropertyPlugin.java      |   75 -
 .../rendering/util/FollowSpecUtil.java             |   39 -
 .../rendering/util/JsonWriterUtil.java             |   50 -
 .../restfulobjects/rendering/util/MapUtils.java    |   48 -
 .../viewer/restfulobjects/rendering/util/Util.java |   99 --
 .../JsonValueEncoderTest_appendValueAndFormat.java |  430 -----
 .../JsonValueEncoderTest_asAdapter.java            |  400 -----
 .../JsonValueEncoderTest_asObject.java             |  248 ---
 core/viewers/restfulobjects/viewer/pom.xml         |   83 -
 .../viewer/context/ResourceContext.java            |  281 ---
 .../viewer/mappers/ExceptionMapperAbstract.java    |  162 --
 .../mappers/ExceptionMapperForObjectNotFound.java  |   37 -
 .../restfulobjects/viewer/mappers/FailureUtil.java |   54 -
 .../viewer/mappers/entity/ExceptionDetail.java     |   91 -
 .../resources/DomainObjectResourceServerside.java  |  746 --------
 .../viewer/resources/DomainResourceHelper.java     |  252 ---
 .../resources/DomainServiceResourceServerside.java |  281 ---
 .../resources/DomainTypeResourceServerside.java    |  342 ----
 .../viewer/resources/HomePageReprRenderer.java     |  195 ---
 .../resources/HomePageResourceServerside.java      |   90 -
 .../viewer/resources/ImageResourceServerside.java  |   64 -
 .../viewer/resources/JsonParserHelper.java         |  162 --
 .../resources/MenuBarsResourceServerside.java      |  118 --
 .../viewer/resources/ObjectActionArgHelper.java    |  147 --
 .../resources/ObjectAdapterAccessHelper.java       |  142 --
 .../resources/ObjectAdapterUpdateHelper.java       |  175 --
 .../viewer/resources/ResourceAbstract.java         |  174 --
 .../viewer/resources/UserResourceServerside.java   |  106 --
 .../viewer/resources/VersionReprRenderer.java      |  114 --
 .../resources/VersionResourceServerside.java       |   99 --
 .../webmodule/IsisRestfulObjectsSessionFilter.java |  435 -----
 .../IsisTransactionFilterForRestfulObjects.java    |   62 -
 .../AuthenticationSessionStrategyBasicAuth.java    |  110 --
 ..._ensureCompatibleAcceptHeader_ContractTest.java |  217 ---
 .../context/ResourceContext_getArg_Test.java       |  157 --
 core/viewers/wicket/model/pom.xml                  |   88 -
 .../wicket/model/common/OnSelectionHandler.java    |   38 -
 .../wicket/model/isis/WicketViewerSettings.java    |   92 -
 .../viewer/wicket/model/links/LinkAndLabel.java    |  188 --
 .../wicket/model/links/ListOfLinksModel.java       |   45 -
 .../wicket/model/mementos/ActionMemento.java       |   94 -
 .../model/mementos/ActionParameterMemento.java     |  100 --
 .../wicket/model/mementos/CollectionMemento.java   |  109 --
 .../wicket/model/mementos/PageParameterNames.java  |  135 --
 .../wicket/model/mementos/PropertyMemento.java     |  128 --
 .../wicket/model/models/ActionArgumentModel.java   |   36 -
 .../viewer/wicket/model/models/ActionModel.java    |  720 --------
 .../wicket/model/models/ActionPromptProvider.java  |   51 -
 .../wicket/model/models/BookmarkTreeNode.java      |  266 ---
 .../model/models/BookmarkTreeNodeComparator.java   |   71 -
 .../wicket/model/models/BookmarkedPagesModel.java  |  143 --
 .../wicket/model/models/EntityCollectionModel.java |  587 -------
 .../viewer/wicket/model/models/EntityModel.java    |  602 -------
 .../model/models/EntityModelForReference.java      |  114 --
 .../wicket/model/models/ImageResourceCache.java    |   39 -
 .../wicket/model/models/ObjectAdapterModel.java    |   45 -
 .../viewer/wicket/model/models/ScalarModel.java    | 1251 --------------
 .../model/models/ScalarModelWithMultiPending.java  |   95 --
 .../wicket/model/models/ServiceActionsModel.java   |   73 -
 .../model/models/ToggledMementosProvider.java      |   32 -
 .../isis/viewer/wicket/model/models/Util.java      |   47 -
 .../viewer/wicket/model/models/ValueModel.java     |   67 -
 .../isis/viewer/wicket/model/models/VoidModel.java |   63 -
 .../wicket/model/models/WicketComponentUtils.java  |   61 -
 .../models/whereami/WhereAmIModelDefault.java      |   90 -
 .../wicket/model/models/EntityModel_hintsTest.java |  154 --
 .../models/LowestCommonSuperclassClosureTest.java  |   62 -
 .../ScalarModel_isScalarSubtypingAnyOf_Test.java   |  106 --
 core/viewers/wicket/ui/pom.xml                     |  362 ----
 .../wicket/ui/CollectionContentsAsFactory.java     |   49 -
 .../isis/viewer/wicket/ui/ComponentType.java       |  183 --
 .../actionresponse/ActionResultResponseType.java   |  221 ---
 .../ui/app/registry/ComponentFactoryRegistrar.java |  108 --
 .../ui/components/about/JarManifestModel.java      |  215 ---
 .../ui/components/actioninfo/ActionInfoPanel.java  |   51 -
 .../components/actionmenu/CssClassFaBehavior.java  |   57 -
 .../entityactions/AdditionalLinksPanel.java        |  182 --
 .../entityactions/EntityActionLinkFactory.java     |   71 -
 .../actionmenu/entityactions/LinkAndLabelUtil.java |   86 -
 .../actionmenu/serviceactions/CssMenuItem.java     |  494 ------
 .../serviceactions/ServiceActionLinkFactory.java   |   54 -
 .../serviceactions/ServiceActionUtil.java          |  279 ---
 .../serviceactions/ServiceActionsPanel.java        |  149 --
 .../serviceactions/ServiceAndAction.java           |   47 -
 .../serviceactions/TertiaryActionsPanel.java       |  143 --
 .../actionprompt/ActionPromptHeaderPanel.java      |   65 -
 .../actions/ActionFormExecutorStrategy.java        |   94 -
 .../components/actions/ActionParametersForm.java   |  206 ---
 .../actions/ActionParametersFormPanel.java         |   60 -
 .../components/actions/ActionParametersPanel.java  |  116 --
 .../bookmarkedpages/BookmarkedPagesPanel.java      |  225 ---
 .../collection/AssociatedWithActionsHelper.java    |   84 -
 .../ui/components/collection/CollectionPanel.java  |  215 ---
 .../selector/CollectionSelectorHelper.java         |  266 ---
 .../selector/CollectionSelectorPanel.java          |  233 ---
 .../CollectionContentsAsAjaxTablePanel.java        |  319 ----
 .../CollectionContentsSortableDataProvider.java    |  195 ---
 .../ajaxtable/IsisAjaxFallbackDataTable.java       |  231 ---
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java  |   93 -
 .../ajaxtable/IsisAjaxNavigationToolbar.java       |  123 --
 .../ajaxtable/IsisTotalRecordsToolbar.java         |  107 --
 .../ajaxtable/PrototypingMessageProvider.java      |   58 -
 .../columns/ObjectAdapterPropertyColumn.java       |  123 --
 .../columns/ObjectAdapterTitleColumn.java          |   93 -
 .../columns/ObjectAdapterToggleboxColumn.java      |  128 --
 .../icons/CollectionContentsAsIconsPanel.java      |   63 -
 .../CollectionContentsAsIconsPanelFactory.java     |   66 -
 .../summary/CollectionContentsAsSummary.java       |  206 ---
 .../CollectionContentsAsSummaryFactory.java        |   95 --
 .../entity/EntityComponentFactoryAbstract.java     |   90 -
 .../entity/collection/EntityCollectionPanel.java   |  191 ---
 .../components/entity/fieldset/PropertyGroup.java  |  260 ---
 .../entity/header/EntityHeaderPanel.java           |   97 --
 .../entity/icontitle/EntityIconAndTitlePanel.java  |  239 ---
 .../icontitle/EntityIconAndTitlePanelFactory.java  |   80 -
 .../selector/links/EntityLinksSelectorPanel.java   |  381 -----
 .../links/EntityLinksSelectorPanelFactory.java     |   65 -
 .../wicket/ui/components/footer/FooterPanel.java   |  187 --
 .../wicket/ui/components/layout/bs3/Util.java      |   43 -
 .../wicket/ui/components/layout/bs3/col/Col.java   |  323 ----
 .../components/layout/bs3/tabs/TabGroupPanel.java  |  134 --
 .../ui/components/property/PropertyEditPanel.java  |  117 --
 .../property/PropertyFormExecutorStrategy.java     |   85 -
 .../PropertyEditPromptHeaderPanel.java             |   65 -
 .../components/scalars/IsisConverterLocator.java   |  126 --
 .../ui/components/scalars/ScalarPanelAbstract.java |  387 -----
 .../components/scalars/ScalarPanelAbstract2.java   |  975 -----------
 .../scalars/ScalarPanelSelect2Abstract.java        |  264 ---
 .../scalars/ScalarPanelTextFieldAbstract.java      |  386 -----
 .../ScalarPanelTextFieldDatePickerAbstract.java    |  128 --
 .../ScalarPanelTextFieldParseableAbstract.java     |   68 -
 .../ui/components/scalars/TextFieldValueModel.java |   75 -
 .../scalars/image/JavaAwtImagePanel.java           |   78 -
 .../scalars/image/JavaAwtImagePanelFactory.java    |   54 -
 .../isisapplib/IsisBlobOrClobPanelAbstract.java    |  434 -----
 .../components/scalars/markup/MarkupComponent.java |   81 -
 .../components/scalars/primitive/BooleanPanel.java |  262 ---
 .../scalars/reference/EntityLinkSelect2Panel.java  |   73 -
 .../scalars/reference/ReferencePanel.java          |  461 -----
 .../scalars/reference/ReferencePanelFactory.java   |   58 -
 .../scalars/string/MultiLineStringPanel.java       |  113 --
 .../scalars/string/StringPanelFactory.java         |   45 -
 .../ui/components/scalars/uuid/UuidConverter.java  |   63 -
 .../scalars/value/ValuePanelFactory.java           |   63 -
 .../valuechoices/ValueChoicesSelect2Panel.java     |  191 ---
 .../StandaloneCollectionPanel.java                 |  122 --
 .../components/tree/IsisToWicketTreeAdapter.java   |  530 ------
 .../ui/components/unknown/UnknownModelPanel.java   |   70 -
 .../wicket/ui/components/welcome/WelcomePanel.java |   54 -
 .../widgets/breadcrumbs/BreadcrumbModel.java       |  190 ---
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |  158 --
 .../widgets/buttons/ContainedButtonPanel.java      |   94 -
 .../entitysimplelink/EntityLinkSimplePanel.java    |   97 --
 .../EntityLinkSimplePanelFactory.java              |   54 -
 .../ui/components/widgets/favicon/Favicon.java     |   65 -
 .../widgets/linkandlabel/ActionLink.java           |  284 ----
 .../widgets/linkandlabel/ActionLinkFactory.java    |   38 -
 .../linkandlabel/ActionLinkFactoryAbstract.java    |  319 ----
 .../ui/components/widgets/navbar/BrandLogo.java    |   72 -
 .../ui/components/widgets/navbar/BrandName.java    |   68 -
 .../ui/components/widgets/select2/ChoiceExt.java   |   40 -
 .../select2/Select2BootstrapCssReference.java      |   48 -
 .../widgets/select2/Select2ChoiceExt.java          |   58 -
 .../widgets/select2/Select2JsReference.java        |   48 -
 .../widgets/select2/Select2MultiChoiceExt.java     |   67 -
 .../ObjectAdapterMementoProviderAbstract.java      |  173 --
 ...entoProviderForReferenceObjectAutoComplete.java |   51 -
 ...derForReferenceParamOrPropertyAutoComplete.java |   75 -
 ...bjectAdapterMementoProviderForValueChoices.java |   66 -
 .../themepicker/IsisWicketThemeSupport.java        |   64 -
 .../themepicker/IsisWicketThemeSupportDefault.java |  136 --
 .../widgets/themepicker/ThemeChooser.java          |  162 --
 .../themepicker/ThemeProviderComposite.java        |  114 --
 .../widgets/zclip/ZeroClipboardPanel.java          |  126 --
 .../viewer/wicket/ui/errors/ExceptionModel.java    |  193 ---
 .../viewer/wicket/ui/errors/JGrowlBehaviour.java   |   86 -
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  524 ------
 .../isis/viewer/wicket/ui/pages/WebPageBase.java   |   77 -
 .../accmngt/signup/RegistrationFormPanel.java      |  128 --
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |  240 ---
 .../viewer/wicket/ui/pages/error/ErrorPage.java    |   91 -
 .../wicket/ui/pages/login/IsisSignInPanel.java     |  170 --
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |  114 --
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |   89 -
 .../wicket/ui/panels/FormExecutorDefault.java      |  547 ------
 .../wicket/ui/panels/FormExecutorStrategy.java     |   41 -
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  162 --
 .../isis/viewer/wicket/ui/panels/PanelUtil.java    |  116 --
 .../wicket/ui/panels/PromptFormAbstract.java       |  378 ----
 .../isis/viewer/wicket/ui/util/Components.java     |  118 --
 .../viewer/wicket/ui/util/CssClassAppender.java    |   76 -
 .../viewer/wicket/ui/util/CssClassRemover.java     |   51 -
 .../isis/viewer/wicket/ui/util/CssIdAppender.java  |   70 -
 .../isis/viewer/wicket/ui/util/Tooltips.java       |   84 -
 .../ui/ComponentFactoryAbstractTest_init.java      |  128 --
 ...ollectionContentsSelectorDropdownPanelTest.java |   79 -
 ...tAdapterMementoProviderForValueChoicesTest.java |  116 --
 core/viewers/wicket/viewer/pom.xml                 |  185 --
 .../integration/ConverterForObjectAdapter.java     |   85 -
 .../ConverterForObjectAdapterMemento.java          |   79 -
 .../viewer/integration/LocalizerForIsis.java       |  149 --
 .../viewer/integration/WebRequestCycleForIsis.java |  404 -----
 .../ComponentFactoryRegistrarDefault.java          |  306 ----
 .../ComponentFactoryRegistryDefault.java           |  200 ---
 .../registries/pages/PageClassRegistryDefault.java |   93 -
 .../viewer/services/DeepLinkServiceWicket.java     |   76 -
 .../services/HintStoreUsingWicketSession.java      |  112 --
 .../services/ImageResourceCacheClassPath.java      |  301 ----
 .../services/TranslationsResolverWicket.java       |  111 --
 .../services/WicketViewerSettingsDefault.java      |  114 --
 .../viewer/services/mementos/CollectionData.java   |   55 -
 .../wicket/viewer/services/mementos/Data.java      |   47 -
 .../viewer/services/mementos/ObjectData.java       |   77 -
 .../viewer/services/mementos/ObjectMarshaller.java |  153 --
 .../services/mementos/ObjectMementoLegacy.java     |  648 -------
 .../mementos/ObjectMementoServiceWicket.java       |  165 --
 .../services/mementos/ObjectUnmarshaller.java      |  298 ----
 .../viewer/services/mementos/StandaloneData.java   |   70 -
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  115 --
 .../viewer/wicketapp/IsisWicketApplication.java    |  618 -------
 .../IsisWicketApplication_Experimental.java        |  107 --
 .../IsisWicketApplication_newPageFactory.java      |   95 --
 .../wicketapp/IsisWicketApplication_Defaults.java  |   79 -
 core/webapp/pom.xml                                |    2 +-
 .../webapp/context/IsisWebAppCommonContext.java    |   10 +-
 .../isis/webapp/context/memento/ObjectMemento.java |    6 +-
 .../context/memento/ObjectMementoCollection.java   |    4 +-
 .../context/memento/ObjectMementoService.java      |    6 +-
 .../org/apache/isis/webapp/modules/WebModule.java  |    2 +-
 .../isis/webapp/modules/WebModuleAbstract.java     |    2 +-
 .../isis/webapp/modules/WebModuleContext.java      |    6 +-
 .../logonlog/WebModuleLogOnExceptionLogger.java    |    2 +-
 .../TemplateResourceCachingFilter.java             |    2 +-
 .../templresources/TemplateResourceServlet.java    |   27 +-
 ...plateResourceServlet_HtmlTemplateVariables.java |    6 +-
 .../templresources/WebModuleTemplateResources.java |    2 +-
 .../apache/isis/webapp/routing/RedirectFilter.java |    2 +-
 .../isis/webapp/routing/RedirectServlet.java       |    2 +-
 .../webappctx/IsisWebAppContextInitializer.java    |   21 +-
 core/webboot-springboot/pom.xml                    |    2 +-
 .../main/java/demoapp/dom/types/blob/BlobDemo.java |    4 +-
 .../dom/types/primitive/PrimitivesDemo.java        |    2 +-
 .../demoapp/utils/LibraryPreloadingService.java    |    4 +-
 .../demo/src/main/java/demoapp/webapp/DemoApp.java |    2 +-
 .../testdomain/conf/Configuration_headless.java    |    2 +-
 .../testdomain/conf/Configuration_usingJdo.java    |    2 +-
 .../conf/Configuration_usingJdoAndShiro.java       |    2 +-
 .../org/apache/isis/testdomain/jdo/BookDto.java    |    4 +-
 .../isis/testdomain/jdo/InventoryResource.java     |    2 +-
 .../isis/testdomain/rest/RestEndpointService.java  |    4 +-
 .../testdomain/auditing/AuditerServiceTest.java    |    2 +-
 .../bootstrapping/AutoConfigurationTest.java       |   12 +-
 .../bootstrapping/JdoBootstrappingTest.java        |    2 +-
 .../JdoBootstrappingTest_usingFixtures.java        |    2 +-
 .../SpringServiceInjectOrderTest.java              |    4 +-
 .../SpringServiceProvisioningTest.java             |   16 +-
 .../commandexecution/WrapperAsyncTest.java         |    2 +-
 .../commandexecution/WrapperSyncTest.java          |    2 +-
 .../org/apache/isis/testdomain/config/FooTest.java |    2 +-
 .../isis/testdomain/config/IsisConfigBeanTest.java |    8 +-
 .../config/IsisConfigBeanTest_usingHeadless.java   |    4 +-
 .../domainmodel/AnnotationSyntesizerTest.java      |    4 +-
 .../DomainModelTest_usingBadDomain.java            |   12 +-
 ...nModelTest_usingBadDomain_noActionEnforced.java |   12 +-
 .../DomainModelTest_usingGoodDomain.java           |    8 +-
 .../domainmodel/SpecloaderPerformanceTest.java     |   10 +-
 .../eventhandling/SpringEventPublishingTest.java   |    2 +-
 .../testdomain/ldap/LdapEmbeddedServerTest.java    |    2 +-
 .../isis/testdomain/logging/LoggerSetupTest.java   |    2 +-
 .../publishing/PublisherServiceTest.java           |    4 +-
 .../isis/testdomain/rest/RestServiceTest.java      |    2 +-
 .../isis/testdomain/shiro/AbstractShiroTest.java   |    2 +-
 .../isis/testdomain/shiro/ShiroLdapTest.java       |    2 +-
 .../shiro/ShiroSecmanLdap_restfulStressTest.java   |    2 +-
 .../isis/testdomain/shiro/ShiroSecmanTest.java     |    2 +-
 .../transactions/TransactionRollbackTest.java      |    4 +-
 ...TransactionRollbackTest_usingTransactional.java |    2 +-
 .../bootstrapping/builtin-domain-services.list     |    4 +-
 .../secman/api/SecurityModuleConfig.java           |    2 +-
 .../api/permission/ApplicationPermission.java      |    2 +-
 .../api/permission/ApplicationPermissionMode.java  |    4 +-
 .../ApplicationPermissionRepository.java           |    2 +-
 .../api/permission/ApplicationPermissionRule.java  |    4 +-
 .../api/permission/ApplicationPermissionValue.java |    2 +-
 .../permission/ApplicationPermissionValueSet.java  |    6 +-
 .../permission/PermissionsEvaluationService.java   |    2 +-
 .../PermissionsEvaluationServiceAbstract.java      |    4 +-
 ...PermissionsEvaluationServiceVetoBeatsAllow.java |    2 +-
 .../extensions/secman/api/user/AccountType.java    |    2 +-
 .../secman/api/user/ApplicationUserStatus.java     |    2 +-
 .../secman/model/app/feature/ApplicationClass.java |    2 +-
 .../model/app/feature/ApplicationClassAction.java  |    2 +-
 .../app/feature/ApplicationClassCollection.java    |    2 +-
 .../model/app/feature/ApplicationClassMember.java  |    2 +-
 .../app/feature/ApplicationClassProperty.java      |    2 +-
 .../app/feature/ApplicationFeatureViewModel.java   |   12 +-
 .../app/feature/ApplicationFeatureViewModels.java  |    6 +-
 .../model/app/feature/ApplicationPackage.java      |    4 +-
 .../app/feature/ApplicationPermission_feature.java |    4 +-
 .../user/ApplicationUser_filterPermissions.java    |    8 +-
 .../app/user/ApplicationUser_permissions.java      |    6 +-
 .../model/app/user/UserPermissionViewModel.java    |   12 +-
 .../model/facets/TenantedAuthorizationFacet.java   |    6 +-
 .../facets/TenantedAuthorizationFacetDefault.java  |   10 +-
 .../facets/TenantedAuthorizationFacetFactory.java  |   10 +-
 .../jdo/dom/permission/ApplicationPermission.java  |    8 +-
 .../ApplicationPermissionRepository.java           |   18 +-
 .../secman/jdo/dom/role/ApplicationRole.java       |    6 +-
 .../jdo/dom/role/ApplicationRoleRepository.java    |    2 +-
 .../secman/jdo/dom/tenancy/ApplicationTenancy.java |    2 +-
 .../dom/tenancy/ApplicationTenancyRepository.java  |    2 +-
 .../secman/jdo/dom/user/ApplicationUser.java       |    8 +-
 .../jdo/dom/user/ApplicationUserRepository.java    |    2 +-
 .../secman/jdo/seed/SeedSecurityModuleService.java |    2 +-
 .../AbstractRoleAndPermissionsFixtureScript.java   |    4 +-
 .../scripts/AbstractUserAndRolesFixtureScript.java |    4 +-
 .../IsisModuleSecurityAdminRoleAndPermissions.java |    2 +-
 extensions/security/secman/pom.xml                 |    2 +-
 .../secman/shiro/AuthInfoForApplicationUser.java   |    2 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.java       |    2 +-
 .../secman/shiro/PermissionForMember.java          |    2 +-
 ...lCollectionForApplicationUserOnSingleRealm.java |    2 +-
 .../secman/shiro/PrincipalForApplicationUser.java  |    2 +-
 extensions/security/shiro-realm-ldap/impl/pom.xml  |    2 +-
 .../shirorealmldap/realm/impl/IsisLdapRealm.java   |    6 +-
 .../cors/impl/webmodule/WebModuleCors.java         |    2 +-
 .../ui/components/ExcelFileModel.java              |    8 +-
 extensions/vw/pdfjs/applib/pom.xml                 |    2 +-
 extensions/vw/pdfjs/fixtures/pom.xml               |    2 +-
 .../pdfjs/metamodel/facet/PdfJsViewerFacet.java    |    2 +-
 .../metamodel/facet/PdfJsViewerFacetAbstract.java  |    6 +-
 .../facet/PdfJsViewerFacetFromAnnotation.java      |    2 +-
 .../PdfJsViewerFacetFromAnnotationFactory.java     |   12 +-
 .../pdfjs/ui/components/PdfJsViewerPanel.java      |    2 +-
 .../PdfJsViewerPanelComponentFactory.java          |    2 +-
 .../jee_support/IsisCDIBeanScanInterceptor.java    |    6 +-
 .../SupportingMethodValidatorRefinerFactory.java   |   20 +-
 .../services/IncubatorMetaModelPlugin.java         |    4 +-
 legacy/extensions/core/applib/pom.xml              |    4 +-
 .../isis/legacy/applib/DomainObjectContainer.java  |    4 +-
 legacy/extensions/core/commons/pom.xml             |    4 +-
 .../internal/threadpool/ThreadPoolSupport.java     |   10 +-
 .../internal/threadpool/ThreadPoolSupportTest.java |    2 +-
 legacy/extensions/core/metamodel/pom.xml           |    4 +-
 .../facets/value/color/ColorValueFacet.java        |    4 +-
 ...lorValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../value/color/ColorValueSemanticsProvider.java   |   10 +-
 .../facets/value/money/MoneyValueFacet.java        |    4 +-
 ...neyValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../value/money/MoneyValueSemanticsProvider.java   |   14 +-
 ...ageValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../PercentageValueSemanticsProvider.java          |   14 +-
 .../value/ColorValueSemanticsProviderTest.java     |    8 +-
 .../value/MoneyValueSemanticsProviderTest.java     |   10 +-
 .../PercentageValueSemanticsProviderTest.java      |    8 +-
 .../PolishMoneyValueSemanticsProviderTest.java     |   10 +-
 legacy/extensions/core/runtime/pom.xml             |    4 +-
 .../runtime/system/persistence/ObjectFactory.java  |    2 +-
 .../runtime/viewer/web/WebAppSpecification.java    |    2 +-
 legacy/mappings/restclient/pom.xml                 |    2 +-
 .../isis/legacy/restclient/RestfulClient.java      |    2 +-
 legacy/testing/mavenplugin/pom.xml                 |    4 +-
 mappings/restclient/api/pom.xml                    |    2 +-
 .../isis/extensions/restclient/ResponseDigest.java |    6 +-
 .../isis/extensions/restclient/RestfulClient.java  |    6 +-
 .../restclient/auth/BasicAuthFilter.java           |    4 +-
 .../restclient/log/RestfulLoggingFilter.java       |    2 +-
 mavendeps/testing/pom.xml                          |    4 +-
 mavendeps/webapp/pom.xml                           |    6 +-
 persistence/jdo/applib/pom.xml                     |   98 ++
 .../jdo/applib/IsisModuleJdoApplib.java            |    0
 .../applib/exceptions/NotPersistableException.java |   43 +
 .../exceptions/UnsupportedFindException.java       |   42 +
 .../applib/fixturestate/FixturesInstalledFlag.java |    0
 .../fixturestate/FixturesInstalledState.java       |    0
 .../fixturestate/FixturesInstalledStateHolder.java |    0
 .../jdo/applib/fixturestate/package-info.java      |    0
 .../jdo/applib/services/IsisJdoSupport.java        |    0
 .../jdo/applib/services/IsisJdoSupport_v3_2.java   |    0
 persistence/jdo/datanucleus-5/pom.xml              |  149 ++
 .../datanucleus5/IsisModuleJdoDataNucleus5.java    |    0
 .../CreateSchemaObjectFromClassMetadata.java       |  219 +++
 .../datanucleus/DataNucleusContextUtil.java        |   59 +
 .../datanucleus/DataNucleusException.java          |   43 +
 .../datanucleus/DataNucleusLifeCycleHelper.java    |    0
 .../datanucleus/DataNucleusPropertiesAware.java    |    0
 .../datanucleus/DataNucleusSettings.java           |    0
 .../datanucleus/JDOStateManagerForIsis.java        |  255 +++
 .../datanucleus/JdoRuntimeException.java           |    0
 .../datanucleus/metamodel/JdoPropertyUtils.java    |   81 +
 .../commands/AbstractDataNucleusObjectCommand.java |   41 +
 .../commands/DataNucleusCreateObjectCommand.java   |   72 +
 .../commands/DataNucleusDeleteObjectCommand.java   |   50 +
 .../PersistenceQueryFindAllInstancesProcessor.java |   58 +
 ...sistenceQueryFindUsingApplibQueryProcessor.java |  159 ++
 .../queries/PersistenceQueryProcessor.java         |   30 +
 .../queries/PersistenceQueryProcessorAbstract.java |   79 +
 .../datanucleus/persistence/queries/QueryUtil.java |   91 +
 .../persistence/spi/JdoObjectIdSerializer.java     |  207 +++
 .../service/JdoPersistenceLifecycleService.java    |  149 ++
 .../service/eventbus/EventBusServiceJdo.java       |    0
 .../typeconverters/IsisMarkupConverter.java        |    0
 .../typeconverters/IsisPasswordConverter.java      |    0
 .../valuemappings/ByteArrayBlobRdbmsMapping.java   |    0
 .../datanucleus/valuetypes/IsisBlobMapping.java    |    0
 .../datanucleus/valuetypes/IsisClobMapping.java    |    0
 .../entities/JdoEntityTypeRegistry.java            |   94 +
 ...eptionRecognizerCompositeForJdoObjectStore.java |   78 +
 ...xceptionRecognizerForJDODataStoreException.java |    0
 ...traintViolationForeignKeyNoActionException.java |    0
 ...ionRecognizerForJDOObjectNotFoundException.java |    0
 ...yConstraintViolationUniqueOrIndexException.java |    0
 .../exceprecog/JdoNestedExceptionResolver.java     |   45 +
 .../datanucleus5/jdosupport/IsisJdoSupportDN5.java |  223 +++
 .../mixins/Persistable_datanucleusIdLong.java      |    0
 .../mixins/Persistable_datanucleusVersionLong.java |    0
 .../Persistable_datanucleusVersionTimestamp.java   |    0
 .../mixins/Persistable_downloadJdoMetadata.java    |   88 +
 .../JdoStoreLifecycleListenerForIsis.java          |    0
 .../datanucleus5/metamodel/JdoMetamodelUtil.java   |   63 +
 .../metamodel/JdoProgrammingModelPlugin.java       |  299 ++++
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |   59 +
 .../JdoDatastoreIdentityFacet.java                 |   34 +
 .../JdoDatastoreIdentityFacetAbstract.java         |   54 +
 .../JdoDatastoreIdentityFacetAnnotation.java       |   32 +
 .../JdoDatastoreIdentityFacetImpl.java             |   32 +
 .../object/datastoreidentity/package-info.java     |    0
 .../JdoDiscriminatorAnnotationFacetFactory.java    |   96 ++
 .../discriminator/JdoDiscriminatorFacet.java       |   25 +
 .../JdoDiscriminatorFacetDefault.java              |   30 +
 ...nferredFromJdoDiscriminatorValueAnnotation.java |   35 +
 .../facets/object/discriminator/package-info.java  |    0
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |   51 +
 ...doPersistenceCapableAnnotationFacetFactory.java |   84 +
 .../JdoPersistenceCapableFacet.java                |   45 +
 .../JdoPersistenceCapableFacetAbstract.java        |   87 +
 .../JdoPersistenceCapableFacetAnnotation.java      |   36 +
 .../JdoPersistenceCapableFacetImpl.java            |  135 ++
 .../object/persistencecapable/package-info.java    |    0
 .../facets/object/query/JdoNamedQuery.java         |  112 ++
 .../object/query/JdoQueriesFacetAnnotation.java    |   36 +
 .../query/JdoQueryAnnotationFacetFactory.java      |   99 ++
 .../facets/object/query/JdoQueryFacet.java         |   59 +
 .../facets/object/query/JdoQueryFacetAbstract.java |   64 +
 .../object/query/JdoQueryFacetAnnotation.java      |   36 +
 .../object/query/VisitorForClauseAbstract.java     |  109 ++
 .../facets/object/query/VisitorForFromClause.java  |   67 +
 .../object/query/VisitorForVariablesClause.java    |   68 +
 .../version/JdoVersionAnnotationFacetFactory.java  |  103 ++
 .../facets/object/version/JdoVersionFacet.java     |   25 +
 .../version/JdoVersionFacetFromAnnotation.java     |   30 +
 .../facets/object/version/package-info.java        |    0
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  180 ++
 .../BigDecimalFacetDerivedFromJdoColumn.java       |   59 +
 .../prop/column/BigDecimalFacetFallback.java       |   47 +
 .../column/MandatoryFacetDerivedFromJdoColumn.java |   36 +
 ...ndatoryFacetInferredFromAbsenceOfJdoColumn.java |   35 +
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |  215 +++
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  155 ++
 .../column/MaxLengthFacetDerivedFromJdoColumn.java |   31 +
 .../JdoNotPersistentAnnotationFacetFactory.java    |   61 +
 .../prop/notpersistent/JdoNotPersistentFacet.java  |   35 +
 .../JdoNotPersistentFacetAbstract.java             |   37 +
 .../JdoNotPersistentFacetAnnotation.java           |   30 +
 .../notpersistent/JdoNotPersistentFacetImpl.java   |   30 +
 ...FacetDerivedFromJdoNotPersistentAnnotation.java |   31 +
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |   35 +
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |   61 +
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |   35 +
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |   37 +
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |   30 +
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |   30 +
 ...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java |   43 +
 .../facets/prop/primarykey/package-info.java       |    0
 .../util/JdoPrimaryKeyPropertyPredicate.java       |   48 +
 .../metrics/MetricsServiceDefault.java             |    0
 .../objectadapter/ObjectAdapterContext.java        |  256 +++
 .../ObjectAdapterContext_DependencyInjection.java  |   67 +
 .../ObjectAdapterContext_Factories.java            |   81 +
 ...ObjectAdapterContext_LifecycleEventSupport.java |   70 +
 .../ObjectAdapterContext_NewIdentifier.java        |   64 +
 ...ctAdapterContext_ObjectAdapterByIdProvider.java |  222 +++
 ...ObjectAdapterContext_ObjectAdapterProvider.java |   65 +
 .../ObjectAdapterContext_ObjectCreation.java       |  150 ++
 .../persistence/DNStoreManagerType.java            |    0
 .../DataNucleusApplicationComponents5.java         |  243 +++
 .../persistence/IsisLifecycleListener.java         |  194 +++
 .../persistence/IsisPersistenceSessionJdo.java     |   83 +
 .../persistence/IsisPersistenceSessionJdoBase.java |  262 +++
 .../IsisPlatformTransactionManagerForJdo.java      |    0
 .../persistence/IsisTransactionJdo.java            |  468 +++++
 .../persistence/IsisTransactionManagerJdo.java     |  334 ++++
 .../persistence/PersistenceSession5.java           |  872 ++++++++++
 .../persistence/PersistenceSessionFactory5.java    |  233 +++
 .../jdo/datanucleus5/persistence/Utils.java        |    0
 .../persistence/command/CreateObjectCommand.java   |    0
 .../persistence/command/DestroyObjectCommand.java  |    0
 .../persistence/command/PersistenceCommand.java    |   28 +
 .../command/PersistenceCommandAbstract.java        |   39 +
 .../persistence/query/PersistenceQuery.java        |   46 +
 .../query/PersistenceQueryAbstract.java            |  101 ++
 .../persistence/query/PersistenceQueryFactory.java |   86 +
 .../query/PersistenceQueryFindAllInstances.java    |   63 +
 ...ersistenceQueryFindUsingApplibQueryDefault.java |   85 +
 .../src/main/resources/META-INF/MANIFEST.MF        |    0
 .../datanucleus-5/src/main/resources/plugin.xml    |    0
 .../ObjectReflectorDefaultTest_object.java         |   81 +
 ...onRecognizerCompositeForJdoObjectStoreTest.java |   89 +
 ...LIntegrityConstraintViolationExceptionTest.java |    0
 ...atastoreIdentityAnnotationFacetFactoryTest.java |  116 ++
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |  117 ++
 ...rsistenceCapableAnnotationFacetFactoryTest.java |  148 ++
 .../query/JdoQueryAnnotationFacetFactoryTest.java  |    0
 .../JdoVersionAnnotationFacetFactoryTest.java      |   91 +
 ...AnnotationFacetFactoryTest_refineMetaModel.java |  275 +++
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  114 ++
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  141 ++
 ...impleObjectWithBigDecimalColumnAnnotations.java |    0
 ...impleObjectWithColumnAllowsNullAnnotations.java |    0
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |  125 ++
 .../SimpleObjectWithNotPersistentColumn.java       |    0
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |  137 ++
 .../primarykey/SimpleObjectWithPrimaryKey.java     |    0
 .../adapterfactory/pojo/PojoAdapterTest.java       |   81 +
 .../transaction/PojoAdapterBuilder.java            |  160 ++
 .../runtime/system/ObjectMemberAbstractTest.java   |  240 +++
 .../WrapperFactoryDefault_wrappedObject_Test.java  |  464 +++++
 ...actoryDefault_wrappedObject_transient_Test.java |  284 ++++
 persistence/jdo/pom.xml                            |   38 +
 .../jdo/src/main/doc/antora.yml                    |    0
 .../images/hints-n-tips/diagnosing-n-plus-1.png    |  Bin
 .../party-agreementrole-agreement.png              |  Bin
 .../jdo/src/main/doc/modules/ROOT/nav.adoc         |    0
 .../jdo/src/main/doc/modules/ROOT/pages/about.adoc |    0
 .../main/doc/modules/ROOT/pages/configuring.adoc   |    0
 .../modules/ROOT/pages/configuring/bulk-load.adoc  |    0
 .../disabling-persistence-by-reachability.adoc     |    0
 .../ROOT/pages/configuring/persistence-xml.adoc    |    0
 .../modules/ROOT/pages/configuring/properties.adoc |    0
 .../pages/configuring/using-jndi-data-source.adoc  |    0
 .../main/doc/modules/ROOT/pages/db-schemas.adoc    |    0
 .../doc/modules/ROOT/pages/hints-and-tips.adoc     |    0
 .../pages/hints-and-tips/diagnosing-n-plus-1.adoc  |    0
 .../modules/ROOT/pages/hints-and-tips/java8.adoc   |    0
 .../pages/hints-and-tips/jdoql-and-timestamps.adoc |    0
 .../hints-and-tips/overriding-jdo-annotations.adoc |    0
 .../subtype-entity-not-fully-populated.adoc        |    0
 .../typesafe-queries-and-fetchgroups.adoc          |    0
 .../main/doc/modules/ROOT/pages/jdo-mappings.adoc  |    0
 .../mandatory-properties-in-subtypes.adoc          |    0
 .../ROOT/pages/jdo-mappings/mapping-to-a-view.adoc |    0
 .../one-to-m-bidirectional-relationships.adoc      |    0
 .../doc/modules/ROOT/partials/component-nav.adoc   |    0
 .../main/doc/modules/ROOT/partials/module-nav.adoc |    0
 security/bypass/pom.xml                            |   48 +
 .../bypass}/src/main/doc/antora.yml                |    0
 .../configure-isis-to-use-bypass.PNG               |  Bin
 .../bypass/src/main/doc/modules/bypass}/nav.adoc   |    0
 .../src/main/doc/modules/bypass/pages/about.adoc   |    0
 .../doc/modules/bypass/partials/module-nav.adoc    |    0
 .../security/bypass/IsisModuleSecurityBypass.java  |    0
 .../bypass/authentication/AuthenticatorBypass.java |    0
 .../bypass/authorization/AuthorizorBypass.java     |    0
 {core/security/shiro => security/keycloak}/NOTICE  |    0
 security/keycloak/pom.xml                          |   81 +
 .../keycloak}/src/main/doc/antora.yml              |    0
 .../src/main/doc/modules/keycloak}/nav.adoc        |    0
 .../src/main/doc/modules/keycloak/pages/about.adoc |    0
 .../doc/modules/keycloak/partials/module-nav.adoc  |    0
 .../keycloak/IsisModuleSecurityKeycloak.java       |    0
 .../authentication/AuthenticatorKeycloak.java      |    0
 .../keycloak/authorization/AuthorizorKeycloak.java |    0
 .../keycloak/webmodule/KeycloakFilter.java         |    0
 .../keycloak/webmodule/WebModuleKeycloak.java      |   72 +
 {core/security/keycloak => security/shiro}/NOTICE  |    0
 security/shiro/pom.xml                             |   96 ++
 .../api => security/shiro}/src/main/doc/antora.yml |    0
 .../configuration/configure-isis-to-use-shiro.png  |  Bin
 .../ini/configure-shiro-to-use-ini-realm.png       |  Bin
 .../configure-shiro-to-use-custom-jdbc-realm.png   |  Bin
 .../ldap/activeds-ldap-groups.png                  |  Bin
 .../ldap/activeds-ldap-mojo-partition.png          |  Bin
 .../ldap/activeds-ldap-mojo-root-dse.png           |  Bin
 .../ldap/activeds-ldap-sasl-authentication.png     |  Bin
 .../configuring-shiro/ldap/activeds-ldap-users.png |  Bin
 .../configure-shiro-to-use-isis-ldap-realm.png     |  Bin
 .../shiro/src/main/doc/modules/shiro}/nav.adoc     |    0
 .../src/main/doc/modules/shiro/pages/about.adoc    |    0
 .../pages/about/configuring-isis-to-use-shiro.adoc |    0
 .../pages/about/enhanced-wildcard-permission.adoc  |    0
 .../doc/modules/shiro/pages/about/ini-realm.adoc   |    0
 .../doc/modules/shiro/pages/about/jdbc-realm.adoc  |    0
 .../doc/modules/shiro/pages/about/ldap-realm.adoc  |    0
 .../main/doc/modules/shiro/pages/about/run-as.adoc |    0
 .../modules/shiro/pages/about/shiro-caching.adoc   |    0
 .../doc/modules/shiro/partials/module-nav.adoc     |    0
 .../security/shiro/IsisModuleSecurityShiro.java    |    0
 .../shiro/authentication/AuthenticatorShiro.java   |  227 +++
 .../shiro/authorization/AuthorizorShiro.java       |    0
 .../shiro/authorization/IsisPermission.java        |  137 ++
 .../authorization/IsisPermissionResolver.java      |    0
 .../shiro/context/ShiroSecurityContext.java        |    0
 .../permrolemapper/PermissionToRoleMapper.java     |    0
 .../PermissionToRoleMapperFromIni.java             |    0
 .../PermissionToRoleMapperFromString.java          |   37 +
 .../isis/security/shiro/permrolemapper/Util.java   |   61 +
 .../security/shiro/webmodule/WebModuleShiro.java   |  202 +++
 .../shiro/IsisPermissionTest_setParts.java         |    0
 .../shiro/IsisPermissionTest_typicalUsage.java     |    0
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  116 ++
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  114 ++
 .../authorization/IsisPermissionTest_equals.java   |    0
 .../PermissionToRoleMapperFromIniTest.java         |   45 +
 .../PermissionToRoleMapperFromStringTest.java      |   45 +
 .../shiro/permrolemapper/UtilTest_parse.java       |    0
 .../isis/security/shiro/permrolemapper/my.ini      |    0
 .../shiro/src/test/resources/shiro.ini             |    0
 subdomains/base/applib/pom.xml                     |    4 +-
 .../base/applib/matchers/IsisMatchers.java         |    2 +-
 ...rableByTitleContractTestAbstract_compareTo.java |    2 -
 subdomains/docx/applib/pom.xml                     |    2 +-
 subdomains/excel/applib/pom.xml                    |    4 +-
 .../subdomains/excel/applib/dom/ExcelService.java  |    2 +-
 .../excel/applib/dom/util/CellMarshaller.java      |    6 +-
 .../excel/applib/dom/util/ExcelConverter.java      |   16 +-
 .../excel/applib/dom/util/ExcelServiceImpl.java    |    6 +-
 subdomains/excel/fixture/pom.xml                   |    2 +-
 subdomains/excel/integtests/pom.xml                |    4 +-
 subdomains/excel/testing/pom.xml                   |    6 +
 subdomains/freemarker/applib/pom.xml               |    2 +-
 subdomains/ognl/applib/pom.xml                     |    2 +-
 subdomains/pdfbox/applib/pom.xml                   |    2 +-
 subdomains/spring/applib/pom.xml                   |    2 +-
 subdomains/xdocreport/applib/pom.xml               |    4 +-
 subdomains/zip/applib/pom.xml                      |    2 +-
 testing/fakedata/applib/pom.xml                    |    4 +-
 .../applib/services/FakeDataServiceTest.java       |    4 +-
 testing/fakedata/fixtures/pom.xml                  |    2 +-
 .../fixtures/IsisModuleTstFakeDataFixtures.java    |    4 +-
 testing/fakedata/integtests/pom.xml                |    2 +-
 testing/fixtures/applib/pom.xml                    |    2 +-
 .../h2console/ui/webmodule/WebModuleH2Console.java |    8 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java  |    6 +-
 testing/integtestsupport/applib/pom.xml            |  192 +++
 .../applib/ExceptionRecognizerTranslate.java       |   75 +
 .../applib/IsisIntegrationTestAbstract.java        |  133 ++
 .../integtestsupport/applib/ThrowableMatchers.java |   51 +
 .../applib/validate/ValidateDomainModel.java       |  121 ++
 testing/integtestsupport/pom.xml                   |   36 +
 .../integtestsupport/src/main/doc/antora.yml       |    0
 .../integ-test-support/images/integ-tests.png      |  Bin
 .../integ-test-support/images/integ-tests.pptx     |  Bin
 .../integ-test-support/images/wrapper-factory.png  |  Bin
 .../main/doc/modules/integ-test-support/nav.adoc   |    0
 .../modules/integ-test-support/pages/about.adoc    |    0
 .../pages/integ-test-support/abstract-class.adoc   |    0
 .../pages/integ-test-support/bootstrapping.adoc    |    0
 .../configuration-properties.adoc                  |    0
 .../integ-test-support/maven-configuration.adoc    |    0
 .../pages/integ-test-support/typical-usage.adoc    |    0
 .../pages/integ-test-support/wrapper-factory.adoc  |    0
 .../integ-test-support/partials/module-nav.adoc    |    0
 testing/pom.xml                                    |   10 +-
 testing/specsupport/applib/pom.xml                 |    2 +-
 .../integration/ObjectFactoryForIntegration.java   |    2 +-
 testing/unittestsupport/applib/pom.xml             |    4 +-
 valuetypes/asciidoc/applib/pom.xml                 |    2 +-
 .../asciidoc/ui/components/AsciiDocComponent.java  |    2 +-
 .../AsciiDocPanelFactoriesForWicket.java           |    2 +-
 valuetypes/markdown/applib/pom.xml                 |    2 +-
 .../markdown/ui/components/MarkdownComponent.java  |    2 +-
 .../sse/applib/value/ListeningMarkup.java          |    2 +-
 .../facets/SseAnnotationFacetFactory.java          |   10 +-
 .../sse/metamodel/facets/SseObserveFacet.java      |    2 +-
 .../metamodel/facets/SseObserveFacetAbstract.java  |   10 +-
 ...eObserveFacetForServerSentEventsAnnotation.java |    2 +-
 .../sse/ui/markup/ListeningMarkupComponent.java    |    2 +-
 .../markup/ListeningMarkupComponent_observing.java |    6 +-
 .../sse/ui/services/SseServiceDefault.java         |    2 +-
 .../sse/ui/webmodule/ServerSentEventsServlet.java  |   12 +-
 .../ui/webmodule/WebModuleServerSentEvents.java    |    2 +-
 viewers/restfulobjects/applib/pom.xml              |   75 +
 .../applib/IsisModuleRestfulObjectsApplib.java     |    0
 .../restfulobjects/applib/JsonRepresentation.java  | 1798 ++++++++++++++++++++
 .../restfulobjects/applib/LinkRepresentation.java  |    0
 .../isis/viewer/restfulobjects/applib/Rel.java     |    0
 .../restfulobjects/applib/RelDefinition.java       |    0
 .../restfulobjects/applib/RepresentationType.java  |    0
 .../restfulobjects/applib/RestfulHttpMethod.java   |    0
 .../restfulobjects/applib/RestfulMediaType.java    |    0
 .../restfulobjects/applib/RestfulRequest.java      |    0
 .../restfulobjects/applib/RestfulResponse.java     |  370 ++++
 .../applib/boot/BootstrapResource.java             |    0
 .../AbstractObjectMemberRepresentation.java        |    0
 .../domainobjects/ActionResultRepresentation.java  |    0
 .../DomainObjectMemberRepresentation.java          |    0
 .../domainobjects/DomainObjectRepresentation.java  |    0
 .../applib/domainobjects/DomainObjectResource.java |    0
 .../applib/domainobjects/DomainRepresentation.java |    0
 .../domainobjects/DomainServiceResource.java       |    0
 .../applib/domainobjects/ListRepresentation.java   |    0
 .../domainobjects/ObjectActionRepresentation.java  |    0
 .../ObjectCollectionRepresentation.java            |    0
 .../ObjectPropertyRepresentation.java              |    0
 .../domainobjects/ScalarValueRepresentation.java   |    0
 .../AbstractTypeMemberRepresentation.java          |    0
 .../ActionDescriptionRepresentation.java           |    0
 .../ActionParameterDescriptionRepresentation.java  |    0
 .../CollectionDescriptionRepresentation.java       |    0
 .../domaintypes/DomainTypeRepresentation.java      |    0
 .../applib/domaintypes/DomainTypeResource.java     |    0
 .../PropertyDescriptionRepresentation.java         |    0
 .../TypeActionResultRepresentation.java            |    0
 .../applib/domaintypes/TypeListRepresentation.java |    0
 .../applib/errors/ErrorRepresentation.java         |    0
 .../applib/health/HealthRepresentation.java        |    0
 .../applib/health/HealthResource.java              |    0
 .../applib/homepage/HomePageRepresentation.java    |    0
 .../applib/homepage/HomePageResource.java          |    0
 .../applib/menubars/MenuBarsResource.java          |    0
 .../applib/user/UserRepresentation.java            |    0
 .../restfulobjects/applib/user/UserResource.java   |    0
 .../restfulobjects/applib/util/JsonMapper.java     |    0
 .../restfulobjects/applib/util/JsonNodeUtils.java  |    0
 .../restfulobjects/applib/util/MediaTypes.java     |   73 +
 .../viewer/restfulobjects/applib/util/Parser.java  |  387 +++++
 .../restfulobjects/applib/util/PathNode.java       |  188 ++
 .../applib/util/UrlEncodingUtils.java              |   81 +
 .../applib/version/VersionRepresentation.java      |    0
 .../applib/version/VersionResource.java            |    0
 ...r.restfulobjects.applib.client.UriBuilderPlugin |    0
 .../viewer/restfulobjects/applib/JsonFixture.java  |   44 +
 ...resentationTest_arrayGet_arraySetElementAt.java |    0
 .../JsonRepresentationTest_asInputStream.java      |   56 +
 .../applib/JsonRepresentationTest_getArray.java    |    0
 .../JsonRepresentationTest_getBigDecimal.java      |    0
 .../JsonRepresentationTest_getBigInteger.java      |    0
 .../applib/JsonRepresentationTest_getBoolean.java  |    0
 .../applib/JsonRepresentationTest_getDouble.java   |    0
 .../applib/JsonRepresentationTest_getInt.java      |    0
 .../JsonRepresentationTest_getLink_isLink.java     |    0
 .../applib/JsonRepresentationTest_getLong.java     |    0
 .../JsonRepresentationTest_getNull_isNull.java     |    0
 .../JsonRepresentationTest_getRepresentation.java  |    0
 .../JsonRepresentationTest_getString_isString.java |    0
 ...onRepresentationTest_isArray_isMap_isValue.java |    0
 .../applib/JsonRepresentationTest_mapHas.java      |    0
 .../applib/JsonRepresentationTest_newArray.java    |    0
 .../applib/JsonRepresentationTest_newObject.java   |    0
 .../applib/JsonRepresentationTest_putXxx.java      |    0
 .../applib/JsonRepresentationTest_size.java        |    0
 ...JsonRepresentationTest_streamArrayElements.java |    0
 .../JsonRepresentationTest_streamMapEntries.java   |    0
 .../applib/JsonRepresentationTest_urlEncoding.java |    0
 .../applib/LinkRepresentationTest_equals.java      |    0
 .../restfulobjects/applib/Rel_getName_Test.java    |    0
 ...entationTypeTest_getMediaType_ContractTest.java |    0
 ...epresentationTypeTest_getName_ContractTest.java |    0
 ...RepresentationTypeTest_lookup_ContractTest.java |    0
 ...RepresentationTypeTest_parser_ContractTest.java |    0
 .../RestfulRequest_DomainModelTest_parser.java     |    0
 ...equestParameterTest_valueOf_xrodomainmodel.java |    0
 ...equestParameterTest_valueOf_xrofollowlinks.java |    0
 .../client/RestfulResponse_HeaderTest_Warning.java |    0
 .../client/RestfulResponse_HttpStatusCodeTest.java |    0
 ...mainObjectRepresentationTest_getCollection.java |    0
 ...ainObjectRepresentationTest_getCollections.java |    0
 ...mainObjectRepresentationTest_getProperties.java |    0
 ...DomainObjectRepresentationTest_getProperty.java |    0
 .../restfulobjects/applib/util/Parser_Test.java    |    0
 .../util/Parser_forCacheControl_ContractTest.java  |    0
 .../Parser_forJaxRsMediaType_ContractTest.java     |    0
 .../applib/util/PathNodeTest_equalsHashcode.java   |    0
 .../applib/util/PathNodeTest_parse.java            |    0
 .../applib/util/PathNodeTest_split.java            |    0
 .../applib/domainObjectRepresentation.json         |    0
 .../viewer/restfulobjects/applib/emptyList.json    |    0
 .../viewer/restfulobjects/applib/emptyMap.json     |    0
 .../isis/viewer/restfulobjects/applib/list.json    |    0
 .../restfulobjects/applib/listOfStrings.json       |    0
 .../isis/viewer/restfulobjects/applib/map.json     |    0
 .../viewer/restfulobjects/applib/servicesList.json |    0
 .../restfulobjects/jaxrs-resteasy-4}/.gitignore    |    0
 viewers/restfulobjects/jaxrs-resteasy-4/pom.xml    |  132 ++
 .../jaxrs-resteasy-4/src/main/doc/antora.yml       |    0
 .../modules/jaxrs-resteasy-4/attachments/.gitkeep  |    0
 .../modules/jaxrs-resteasy-4/examples/.gitignore   |    0
 .../doc/modules/jaxrs-resteasy-4}/images/.gitkeep  |    0
 .../src/main/doc/modules/jaxrs-resteasy-4/nav.adoc |    0
 .../doc/modules/jaxrs-resteasy-4/pages/about.adoc  |    0
 .../jaxrs-resteasy-4/partials/module-nav.adoc      |    0
 .../IsisModuleRestfulObjectsJaxrsResteasy4.java    |    0
 .../conneg/RestfulObjectsJaxbWriterForXml.java     |    0
 .../webmodule/WebModuleJaxrsResteasy4.java         |  142 ++
 .../Parser_forCacheControl_Test.java               |    0
 .../Parser_forJaxRsMediaType_Test.java             |    0
 .../RepresentationTypeTest_getMediaType.java       |    0
 .../RepresentationTypeTest_getName.java            |    0
 .../RepresentationTypeTest_lookup.java             |    0
 .../RepresentationTypeTest_parser.java             |    0
 ...eContext_ensureCompatibleAcceptHeader_Test.java |    0
 ...tfulObjectsApplicationExceptionMapper_Test.java |    0
 viewers/restfulobjects/pom.xml                     |   42 +
 viewers/restfulobjects/rendering/pom.xml           |   59 +
 .../viewer/restfulobjects/rendering/Caching.java   |    0
 .../rendering/ExceptionWithBody.java               |    0
 .../rendering/ExceptionWithHttpStatusCode.java     |    0
 .../restfulobjects/rendering/IResourceContext.java |   99 ++
 .../IsisModuleRestfulObjectsRendering.java         |    0
 .../restfulobjects/rendering/LinkBuilder.java      |    0
 .../restfulobjects/rendering/LinkFollowSpecs.java  |  127 ++
 .../viewer/restfulobjects/rendering/OidUtils.java  |   68 +
 .../restfulobjects/rendering/RendererFactory.java  |    0
 .../restfulobjects/rendering/ReprRenderer.java     |    0
 .../rendering/ReprRendererAbstract.java            |  215 +++
 .../rendering/ReprRendererException.java           |    0
 .../viewer/restfulobjects/rendering/Responses.java |    0
 .../RestfulObjectsApplicationException.java        |    0
 .../restfulobjects/rendering/UrlDecoderUtils.java  |    0
 .../AbstractObjectMemberReprRenderer.java          |  320 ++++
 .../domainobjects/ActionResultReprRenderer.java    |  206 +++
 .../rendering/domainobjects/BodyArgs.java          |    0
 .../domainobjects/CollectionSemantics.java         |   46 +
 .../domainobjects/DomainObjectLinkTo.java          |   99 ++
 .../domainobjects/DomainObjectReprRenderer.java    |  473 +++++
 .../domainobjects/DomainServiceLinkTo.java         |   58 +
 .../rendering/domainobjects/InvokeKeys.java        |    0
 .../rendering/domainobjects/JsonValueEncoder.java  |  255 +++
 .../domainobjects/JsonValueEncoder_Converters.java |  681 ++++++++
 .../rendering/domainobjects/ListReprRenderer.java  |  130 ++
 .../rendering/domainobjects/MemberReprMode.java    |    0
 .../rendering/domainobjects/MemberType.java        |  153 ++
 .../rendering/domainobjects/MutatorSpec.java       |   51 +
 .../domainobjects/ObjectActionReprRenderer.java    |  239 +++
 .../domainobjects/ObjectAdapterLinkTo.java         |   41 +
 .../rendering/domainobjects/ObjectAndAction.java   |   30 +
 .../domainobjects/ObjectAndActionInvocation.java   |  106 ++
 .../domainobjects/ObjectAndCollection.java         |   30 +
 .../domainobjects/ObjectAndCollection2.java        |   39 +
 .../rendering/domainobjects/ObjectAndMember.java   |   41 +
 .../rendering/domainobjects/ObjectAndProperty.java |   30 +
 .../domainobjects/ObjectAndProperty2.java          |   40 +
 .../ObjectCollectionReprRenderer.java              |  194 +++
 .../domainobjects/ObjectPropertyReprRenderer.java  |  256 +++
 .../domainobjects/ScalarValueReprRenderer.java     |   87 +
 .../AbstractTypeFeatureReprRenderer.java           |  108 ++
 .../AbstractTypeMemberReprRenderer.java            |   79 +
 .../domaintypes/ActionDescriptionReprRenderer.java |   90 +
 .../ActionParameterDescriptionReprRenderer.java    |  104 ++
 .../CollectionDescriptionReprRenderer.java         |   63 +
 .../domaintypes/DomainTypeReprRenderer.java        |  187 ++
 .../domaintypes/ObjectSpecAndSuperSpec.java        |   41 +
 .../rendering/domaintypes/ParentSpecAndAction.java |   30 +
 .../domaintypes/ParentSpecAndActionParam.java      |   30 +
 .../domaintypes/ParentSpecAndCollection.java       |   30 +
 .../domaintypes/ParentSpecAndFeature.java          |   42 +
 .../domaintypes/ParentSpecAndProperty.java         |   30 +
 .../PropertyDescriptionReprRenderer.java           |   73 +
 .../domaintypes/TypeActionResultReprRenderer.java  |   73 +
 .../domaintypes/TypeListReprRenderer.java          |   67 +
 .../rendering/service/RepresentationService.java   |   85 +
 .../RepresentationServiceContentNegotiator.java    |  162 ++
 .../acceptheader/AcceptHeaderServiceForRest.java   |  103 ++
 .../service/conneg/ContentNegotiationService.java  |   51 +
 .../conneg/ContentNegotiationServiceAbstract.java  |  160 ++
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  413 +++++
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |  426 +++++
 .../ContentNegotiationServiceXRoDomainType.java    |  165 ++
 .../service/swagger/SwaggerServiceDefault.java     |   61 +
 .../service/swagger/SwaggerServiceMenu.java        |  162 ++
 .../service/swagger/internal/Caching.java          |    0
 .../service/swagger/internal/ClassExcluder.java    |    9 +
 .../swagger/internal/ClassExcluderAbstract.java    |   65 +
 .../swagger/internal/ClassExcluderDefault.java     |    0
 .../service/swagger/internal/Generation.java       |  863 ++++++++++
 .../swagger/internal/SwaggerSpecGenerator.java     |   87 +
 .../rendering/service/swagger/internal/Tagger.java |    0
 .../service/swagger/internal/TaggerDefault.java    |    0
 .../rendering/service/swagger/internal/Util.java   |  173 ++
 .../swagger/internal/ValuePropertyFactory.java     |    0
 .../internal/ValuePropertyFactoryDefault.java      |  148 ++
 .../swagger/internal/ValuePropertyPlugin.java      |   75 +
 .../rendering/util/FollowSpecUtil.java             |   39 +
 .../rendering/util/JsonWriterUtil.java             |   50 +
 .../restfulobjects/rendering/util/ListUtils.java   |    0
 .../restfulobjects/rendering/util/MapUtils.java    |   48 +
 .../viewer/restfulobjects/rendering/util/Util.java |   99 ++
 .../rendering/LinkFollowSpecsTest_follow.java      |    0
 .../JsonValueEncoderTest_appendValueAndFormat.java |  430 +++++
 .../JsonValueEncoderTest_asAdapter.java            |  400 +++++
 .../JsonValueEncoderTest_asObject.java             |  248 +++
 .../service/swagger/internal/GenerationTest.java   |    0
 .../service/swagger/internal/TaggerTest.java       |    0
 .../rendering/util/MapUtilsTest.java               |    0
 .../restfulobjects/src/main/doc/antora.yml         |    0
 .../ro-spec-resources-and-representations.png      |  Bin
 .../ROOT/images/rgfis/service-collaborations.png   |  Bin
 .../src/main/doc/modules/ROOT/nav.adoc             |    0
 .../src/main/doc/modules/ROOT/pages/about.adoc     |    0
 .../main/doc/modules/ROOT/pages/architecture.adoc  |    0
 .../ROOT/pages/configuration-properties.adoc       |    0
 .../main/doc/modules/ROOT/pages/health-check.adoc  |    0
 .../doc/modules/ROOT/pages/hints-and-tips.adoc     |    0
 .../ROOT/pages/hints-and-tips/angular-tips.adoc    |    0
 .../ROOT/pages/hints-and-tips/pretty-printing.adoc |    0
 .../hints-and-tips/restful-image-property.adoc     |    0
 .../ROOT/pages/hints-and-tips/troubleshooting.adoc |    0
 .../hints-and-tips/using-chrome-devtools.adoc      |    0
 .../hints-and-tips/view-model-as-parameter.adoc    |    0
 .../doc/modules/ROOT/pages/layout-resources.adoc   |    0
 .../src/main/doc/modules/ROOT/pages/ro-spec.adoc   |    0
 .../src/main/doc/modules/ROOT/pages/security.adoc  |    0
 .../ROOT/pages/simplified-representations.adoc     |    0
 .../action-invocation.adoc                         |    0
 .../apache-isis-profile.adoc                       |    0
 .../configuration-properties.adoc                  |    0
 .../simplified-representations/domain-object.adoc  |    0
 .../object-collection.adoc                         |    0
 .../other-representations.adoc                     |    0
 .../doc/modules/ROOT/partials/component-nav.adoc   |    0
 .../main/doc/modules/ROOT/partials/module-nav.adoc |    0
 .../ROOT/partials/security/user-registration.adoc  |    0
 .../modules/ROOT/partials/security/web-xml.adoc    |    0
 viewers/restfulobjects/viewer/pom.xml              |   82 +
 .../viewer/IsisModuleRestfulObjectsViewer.java     |    0
 .../viewer/context/ResourceContext.java            |  280 +++
 .../viewer/jaxrsapp/RestfulObjectsSpec.java        |    0
 .../viewer/mappers/ExceptionMapperAbstract.java    |  162 ++
 .../mappers/ExceptionMapperForObjectNotFound.java  |   37 +
 ...xceptionMapperForRestfulObjectsApplication.java |    0
 .../ExceptionMapperForRuntimeException.java        |    0
 .../restfulobjects/viewer/mappers/FailureUtil.java |   54 +
 .../viewer/mappers/entity/ExceptionDetail.java     |   91 +
 .../viewer/mappers/entity/ExceptionPojo.java       |    0
 .../resources/DomainObjectResourceServerside.java  |  746 ++++++++
 .../viewer/resources/DomainResourceHelper.java     |  252 +++
 .../resources/DomainServiceResourceServerside.java |  281 +++
 .../resources/DomainServicesListReprRenderer.java  |    0
 .../resources/DomainTypeResourceServerside.java    |  342 ++++
 .../viewer/resources/HomePageReprRenderer.java     |  195 +++
 .../resources/HomePageResourceServerside.java      |   90 +
 .../viewer/resources/ImageResourceServerside.java  |   64 +
 .../viewer/resources/JsonParserHelper.java         |  162 ++
 .../resources/MenuBarsResourceServerside.java      |  119 ++
 .../viewer/resources/ObjectActionArgHelper.java    |  146 ++
 .../resources/ObjectAdapterAccessHelper.java       |  142 ++
 .../resources/ObjectAdapterUpdateHelper.java       |  175 ++
 .../viewer/resources/ResourceAbstract.java         |  174 ++
 .../viewer/resources/SwaggerSpecResource.java      |    0
 .../viewer/resources/UserReprRenderer.java         |    0
 .../viewer/resources/UserResourceServerside.java   |  106 ++
 .../viewer/resources/VersionReprRenderer.java      |  114 ++
 .../resources/VersionResourceServerside.java       |   99 ++
 .../serialization/SerializationStrategy.java       |    0
 .../restfulobjects/viewer/util/UrlParserUtils.java |    0
 .../webmodule/IsisRestfulObjectsSessionFilter.java |  435 +++++
 .../IsisTransactionFilterForRestfulObjects.java    |   62 +
 .../auth/AuthenticationSessionStrategy.java        |    0
 .../AuthenticationSessionStrategyAbstract.java     |    0
 .../AuthenticationSessionStrategyBasicAuth.java    |  110 ++
 .../auth/AuthenticationSessionStrategyDefault.java |    0
 .../main/resources/static/swagger-ui/00-README.md  |    0
 .../resources/static/swagger-ui/favicon-16x16.png  |  Bin
 .../resources/static/swagger-ui/favicon-32x32.png  |  Bin
 .../static/swagger-ui/index-ORIG-3.24.3.html       |    0
 .../static/swagger-ui/oauth2-redirect.html         |    0
 .../static/swagger-ui/swagger-ui-bundle.js         |    0
 .../static/swagger-ui/swagger-ui-bundle.js.map     |    0
 .../swagger-ui/swagger-ui-standalone-preset.js     |    0
 .../swagger-ui/swagger-ui-standalone-preset.js.map |    0
 .../resources/static/swagger-ui/swagger-ui.css     |    0
 .../resources/static/swagger-ui/swagger-ui.css.map |    0
 .../main/resources/static/swagger-ui/swagger-ui.js |    0
 .../resources/static/swagger-ui/swagger-ui.js.map  |    0
 .../src/main/resources/swagger-ui/index.thtml      |    0
 ..._ensureCompatibleAcceptHeader_ContractTest.java |  217 +++
 .../context/ResourceContext_getArg_Test.java       |  157 ++
 .../context/ResourceContext_stripQuotes_Test.java  |    0
 ...tsApplicationExceptionMapper_Test_Contract.java |    0
 .../DomainResourceHelper_readBodyAsMap_Test.java   |    0
 .../viewer/resources/JsonParserHelper_Test.java    |    0
 .../viewer/util/UrlParserUtils_Test.java           |    0
 ...ulObjectsSessionFilter_lookupPassThru_Test.java |    0
 viewers/wicket/model/pom.xml                       |   87 +
 .../viewer/wicket/model/IsisModuleWicketModel.java |    0
 .../wicket/model/common/CommonContextUtils.java    |    0
 .../wicket/model/common/OnSelectionHandler.java    |   38 +
 .../wicket/model/common/PageParametersUtils.java   |    0
 .../wicket/model/hints/HasUiHintDisambiguator.java |    0
 .../model/hints/IsisActionCompletedEvent.java      |    0
 .../wicket/model/hints/IsisEnvelopeEvent.java      |    0
 .../wicket/model/hints/IsisEventAbstract.java      |    0
 .../model/hints/IsisEventLetterAbstract.java       |    0
 .../hints/IsisPropertyEditCompletedEvent.java      |    0
 .../wicket/model/hints/IsisSelectorEvent.java      |    0
 .../viewer/wicket/model/hints/UiHintContainer.java |    0
 .../wicket/model/isis/WicketViewerSettings.java    |   92 +
 .../model/isis/WicketViewerSettingsAccessor.java   |    0
 .../viewer/wicket/model/links/LinkAndLabel.java    |  188 ++
 .../viewer/wicket/model/links/LinksProvider.java   |    0
 .../wicket/model/links/ListOfLinksModel.java       |   45 +
 .../wicket/model/mementos/ActionMemento.java       |   94 +
 .../model/mementos/ActionParameterMemento.java     |  100 ++
 .../wicket/model/mementos/CollectionMemento.java   |  109 ++
 .../mementos/ObjectAdapterMemento_Legacy.java      |    0
 .../wicket/model/mementos/PageParameterNames.java  |  135 ++
 .../wicket/model/mementos/PropertyMemento.java     |  128 ++
 .../viewer/wicket/model/models/AboutModel.java     |    0
 .../wicket/model/models/ActionArgumentModel.java   |   35 +
 .../viewer/wicket/model/models/ActionModel.java    |  720 ++++++++
 .../viewer/wicket/model/models/ActionPrompt.java   |    0
 .../wicket/model/models/ActionPromptProvider.java  |   51 +
 .../model/models/ActionPromptWithExtraContent.java |    0
 .../wicket/model/models/BookmarkTreeNode.java      |  266 +++
 .../model/models/BookmarkTreeNodeComparator.java   |   71 +
 .../wicket/model/models/BookmarkableModel.java     |    0
 .../wicket/model/models/BookmarkedPagesModel.java  |  143 ++
 .../wicket/model/models/EntityCollectionModel.java |  587 +++++++
 .../viewer/wicket/model/models/EntityModel.java    |  602 +++++++
 .../model/models/EntityModelForReference.java      |  114 ++
 .../viewer/wicket/model/models/FormExecutor.java   |    0
 .../wicket/model/models/FormExecutorContext.java   |    0
 .../model/models/HintPageParameterSerializer.java  |    0
 .../wicket/model/models/ImageResourceCache.java    |   39 +
 .../wicket/model/models/InlinePromptContext.java   |    0
 .../viewer/wicket/model/models/ModelAbstract.java  |    0
 .../wicket/model/models/ObjectAdapterModel.java    |   45 +
 .../isis/viewer/wicket/model/models/PageType.java  |    0
 .../model/models/ParentEntityModelProvider.java    |    0
 .../viewer/wicket/model/models/ScalarModel.java    | 1251 ++++++++++++++
 .../model/models/ScalarModelWithMultiPending.java  |   95 ++
 .../model/models/ScalarModelWithPending.java       |    0
 .../wicket/model/models/ServiceActionsModel.java   |   73 +
 .../model/models/ToggledMementosProvider.java      |   32 +
 .../isis/viewer/wicket/model/models/Util.java      |   47 +
 .../viewer/wicket/model/models/ValueModel.java     |   67 +
 .../isis/viewer/wicket/model/models/VoidModel.java |   63 +
 .../viewer/wicket/model/models/WelcomeModel.java   |    0
 .../wicket/model/models/WicketComponentUtils.java  |   61 +
 .../model/models/whereami/WhereAmIModel.java       |    0
 .../models/whereami/WhereAmIModelDefault.java      |   90 +
 .../viewer/wicket/model/util/ComponentHintKey.java |    0
 .../wicket/model/models/ActionModelTest.java       |    0
 .../wicket/model/models/EntityModel_hintsTest.java |  154 ++
 .../models/LowestCommonSuperclassClosureTest.java  |   62 +
 .../ScalarModel_isScalarSubtypingAnyOf_Test.java   |  106 ++
 viewers/wicket/pom.xml                             |   42 +
 .../wicket/src/main/doc/antora.yml                 |    0
 .../modules/ROOT/images/about-page/about-page.png  |  Bin
 .../ROOT/images/application-menu/dividers.png      |  Bin
 .../ROOT/images/application-menu/layout-menus.pdn  |  Bin
 .../ROOT/images/application-menu/layout-menus.png  |  Bin
 .../ROOT/images/application-menu/tertiary.png      |  Bin
 .../blob-attachments/010-attachment-field-940.png  |  Bin
 .../blob-attachments/010-attachment-field.png      |  Bin
 .../blob-attachments/020-edit-choose-file-940.png  |  Bin
 .../blob-attachments/020-edit-choose-file.png      |  Bin
 .../030-choose-file-using-browser-520.png          |  Bin
 .../030-choose-file-using-browser.png              |  Bin
 .../040-edit-chosen-file-indicated-940.png         |  Bin
 .../040-edit-chosen-file-indicated.png             |  Bin
 .../050-ok-if-image-then-rendered-940.png          |  Bin
 .../050-ok-if-image-then-rendered.png              |  Bin
 .../images/blob-attachments/060-download-940.png   |  Bin
 .../ROOT/images/blob-attachments/060-download.png  |  Bin
 .../images/blob-attachments/070-edit-clear-940.png |  Bin
 .../images/blob-attachments/070-edit-clear.png     |  Bin
 .../ROOT/images/bookmarked-pages/panel-940.png     |  Bin
 .../images/bookmarked-pages/panel-estatio-940.png  |  Bin
 .../ROOT/images/bookmarked-pages/panel-estatio.png |  Bin
 .../modules/ROOT/images/bookmarked-pages/panel.png |  Bin
 .../ROOT/images/brand-logo/brand-logo-signin.png   |  Bin
 .../modules/ROOT/images/brand-logo/brand-logo.png  |  Bin
 .../images/copy-link/010-copy-link-button-940.png  |  Bin
 .../ROOT/images/copy-link/010-copy-link-button.png |  Bin
 .../images/copy-link/020-copy-link-dialog-940.png  |  Bin
 .../ROOT/images/copy-link/020-copy-link-dialog.png |  Bin
 .../ROOT/images/copy-link/030-hints-940.png        |  Bin
 .../modules/ROOT/images/copy-link/030-hints.png    |  Bin
 .../copy-link/040-copy-link-with-hints-940.png     |  Bin
 .../images/copy-link/040-copy-link-with-hints.png  |  Bin
 .../ROOT/images/copy-link/050-title-url-940.png    |  Bin
 .../ROOT/images/copy-link/050-title-url.png        |  Bin
 .../doc/modules/ROOT/images/dialog-mode/modal.png  |  Bin
 .../modules/ROOT/images/dialog-mode/sidebar.png    |  Bin
 .../ROOT/images/embedded-view/no-footer.png        |  Bin
 .../images/embedded-view/no-header-no-footer.png   |  Bin
 .../ROOT/images/embedded-view/no-header.png        |  Bin
 .../modules/ROOT/images/embedded-view/regular.png  |  Bin
 .../images/features/recent-pages/recent-pages.png  |  Bin
 .../object-titles-and-icons/cust-order-product.png |  Bin
 .../images/layout-dynamic-xml/ToDoAppDashboard.png |  Bin
 .../ROOT/images/layout-dynamic-xml/ToDoItem.png    |  Bin
 .../modules/ROOT/images/layouts/customer-order.png |  Bin
 .../ROOT/images/layouts/estatio-Invoice.png        |  Bin
 .../modules/ROOT/images/layouts/estatio-Lease.png  |  Bin
 .../ROOT/images/layouts/estatio-LeaseItem.png      |  Bin
 .../ROOT/images/layouts/todoapp-ToDoItem.png       |  Bin
 .../modules/ROOT/images/menubars/010-download.png  |  Bin
 .../modules/ROOT/images/menubars/020-download.png  |  Bin
 .../ROOT/images/reference-layout/4-0-8-0.png       |  Bin
 .../ROOT/images/reference-layout/4-4-4-12.png      |  Bin
 .../ROOT/images/reference-layout/6-6-0-12.png      |  Bin
 .../reference-layout/isis-layout-show-facets.css   |    0
 .../ROOT/images/reference-layout/isis-layout.css   |    0
 .../images/reference-layout/layout-4-0-8-0.html    |    0
 .../images/reference-layout/layout-4-4-4-12.html   |    0
 .../images/reference-layout/layout-6-6-0-12.html   |    0
 .../login-page-default.png                         |  Bin
 .../login-page-suppress-password-reset.png         |  Bin
 .../suppress-remember-me}/login-page-default.png   |  Bin
 .../login-page-suppress-remember-me.png            |  Bin
 .../suppress-sign-up}/login-page-default.png       |  Bin
 .../login-page-suppress-sign-up.png                |  Bin
 .../ROOT/images/theme-chooser/example-1.png        |  Bin
 .../ROOT/images/theme-chooser/example-2.png        |  Bin
 .../user-registration}/login-page-default.png      |  Bin
 .../sign-up-after-registration.png                 |  Bin
 .../sign-up-email-with-verification-link.png       |  Bin
 .../sign-up-login-page-after-sign-up.png           |  Bin
 .../ROOT/images/user-registration/sign-up-page.png |  Bin
 .../sign-up-registration-page.png                  |  Bin
 .../ROOT/images/where-am-i/hello_grey_bg.png       |  Bin
 .../wicket/src/main/doc/modules/ROOT/nav.adoc      |    0
 .../src/main/doc/modules/ROOT/pages/about.adoc     |    0
 .../ROOT/pages/configuration-properties.adoc       |    0
 .../main/doc/modules/ROOT/pages/customisation.adoc |    0
 .../ROOT/pages/customisation/about-page.adoc       |    0
 .../ROOT/pages/customisation/auto-refresh.adoc     |    0
 .../ROOT/pages/customisation/brand-logo.adoc       |    0
 .../customisation/cheap-n-cheerful-theme.adoc      |    0
 .../pages/customisation/custom-javascript.adoc     |    0
 .../pages/customisation/request-parameters.adoc    |    0
 .../pages/customisation/top-level-index-page.adoc  |    0
 .../pages/customisation/tweaking-css-classes.adoc  |    0
 .../customisation/using-different-css-file.adoc    |    0
 .../ROOT/pages/customisation/welcome-page.adoc     |    0
 .../src/main/doc/modules/ROOT/pages/extending.adoc |    0
 .../pages/extending/custom-bootstrap-theme.adoc    |    0
 .../modules/ROOT/pages/extending/custom-pages.adoc |    0
 .../login-via-query-args-prototyping.adoc          |    0
 .../pages/extending/replacing-page-elements.adoc   |    0
 .../src/main/doc/modules/ROOT/pages/features.adoc  |    0
 .../ROOT/pages/features/blob-attachments.adoc      |    0
 .../ROOT/pages/features/bookmarked-pages.adoc      |    0
 .../ROOT/pages/features/hints-and-copy-url.adoc    |    0
 .../modules/ROOT/pages/features/recent-pages.adoc  |    0
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |    0
 .../ROOT/pages/features/titles-in-tables.adoc      |    0
 .../ROOT/pages/features/user-registration.adoc     |    0
 .../modules/ROOT/pages/features/where-am-i.adoc    |    0
 .../doc/modules/ROOT/pages/hints-and-tips.adoc     |    0
 .../hints-and-tips/highlight-current-row.adoc      |    0
 .../i18n-label-in-wicket-viewer.adoc               |    0
 .../ROOT/pages/hints-and-tips/per-user-themes.adoc |    0
 .../ROOT/pages/hints-and-tips/svg-support.adoc     |    0
 .../doc/modules/ROOT/pages/incode-platform.adoc    |    0
 .../src/main/doc/modules/ROOT/pages/layout.adoc    |    0
 .../ROOT/pages/layout/annotation-based.adoc        |    0
 .../doc/modules/ROOT/pages/layout/file-based.adoc  |    0
 .../modules/ROOT/pages/layout/table-columns.adoc   |    0
 .../doc/modules/ROOT/pages/menubars-layout.adoc    |    0
 .../pages/menubars-layout/annotation-based.adoc    |    0
 .../ROOT/pages/menubars-layout/file-based.adoc     |    0
 .../src/main/doc/modules/ROOT/pages/security.adoc  |    0
 .../doc/modules/ROOT/partials/component-nav.adoc   |    0
 .../main/doc/modules/ROOT/partials/module-nav.adoc |    0
 .../doc/modules/ROOT/partials/security/pages.adoc  |    0
 .../ROOT/partials/security/user-registration.adoc  |    0
 viewers/wicket/ui/pom.xml                          |  361 ++++
 .../wicket/ui/src/main/java/images/Images.java     |    0
 .../wicket/ui/CollectionContentsAsFactory.java     |   51 +
 .../isis/viewer/wicket/ui/ComponentFactory.java    |    0
 .../viewer/wicket/ui/ComponentFactoryAbstract.java |    0
 .../isis/viewer/wicket/ui/ComponentType.java       |  183 ++
 .../wicket/ui/HeaderContributorProvider.java       |    0
 .../isis/viewer/wicket/ui/IsisModuleWicketUi.java  |    0
 .../ui/actionresponse/ActionResultResponse.java    |    0
 .../ActionResultResponseHandlingStrategy.java      |    0
 .../actionresponse/ActionResultResponseType.java   |  221 +++
 .../ui/app/registry/ComponentFactoryRegistrar.java |  108 ++
 .../ui/app/registry/ComponentFactoryRegistry.java  |    0
 .../registry/ComponentFactoryRegistryAccessor.java |    0
 .../wicket/ui/components/about/AboutPanel.html     |    0
 .../wicket/ui/components/about/AboutPanel.java     |    0
 .../ui/components/about/AboutPanelFactory.java     |    0
 .../ui/components/about/JarManifestAttributes.java |    0
 .../ui/components/about/JarManifestListView.java   |    0
 .../ui/components/about/JarManifestModel.java      |  215 +++
 .../ui/components/about/JarManifestPanel.css       |    0
 .../ui/components/about/JarManifestPanel.html      |    0
 .../ui/components/about/JarManifestPanel.java      |    0
 .../wicket/ui/components/about/div-toggle.js       |    0
 .../ui/components/actioninfo/ActionInfoPanel.html  |    0
 .../ui/components/actioninfo/ActionInfoPanel.java  |   51 +
 .../actioninfo/ActionInfoPanelFactory.java         |    0
 .../ui/components/actionlink/ActionLinkPanel.html  |    0
 .../ui/components/actionlink/ActionLinkPanel.java  |    0
 .../actionlink/ActionLinkPanelFactory.java         |    0
 .../components/actionmenu/CssClassFaBehavior.java  |   57 +
 .../AdditionalLinksAsDropDownPanel.html            |    0
 .../AdditionalLinksAsDropDownPanel.java            |    0
 .../AdditionalLinksAsListInlinePanel.html          |    0
 .../AdditionalLinksAsListInlinePanel.java          |    0
 .../entityactions/AdditionalLinksPanel.java        |  182 ++
 .../entityactions/EntityActionLinkFactory.java     |   71 +
 .../actionmenu/entityactions/LinkAndLabelUtil.java |   86 +
 .../actionmenu/serviceactions/CssMenuItem.java     |  494 ++++++
 .../serviceactions/CssMenuItemPanelAbstract.java   |    0
 .../serviceactions/CssSubMenuItemsPanel.html       |    0
 .../serviceactions/CssSubMenuItemsPanel.java       |    0
 .../serviceactions/ServiceActionLinkFactory.java   |   54 +
 .../serviceactions/ServiceActionUtil.java          |  279 +++
 .../serviceactions/ServiceActionsPanel.css         |    0
 .../serviceactions/ServiceActionsPanel.html        |    0
 .../serviceactions/ServiceActionsPanel.java        |  149 ++
 .../serviceactions/ServiceActionsPanelFactory.java |    0
 .../serviceactions/ServiceAndAction.java           |   47 +
 .../serviceactions/TertiaryActionsPanel.css        |    0
 .../serviceactions/TertiaryActionsPanel.html       |    0
 .../serviceactions/TertiaryActionsPanel.java       |  143 ++
 .../serviceactions/TertiaryMenuPanelFactory.java   |    0
 .../actionprompt/ActionPromptHeaderPanel.html      |    0
 .../actionprompt/ActionPromptHeaderPanel.java      |   65 +
 .../actionprompt/ActionPromptModalWindow.html      |    0
 .../actionprompt/ActionPromptModalWindow.java      |    0
 .../actionpromptsb/ActionPromptSidebar.html        |    0
 .../actionpromptsb/ActionPromptSidebar.java        |    0
 .../actions/ActionFormExecutorStrategy.java        |   94 +
 .../components/actions/ActionParametersForm.java   |  205 +++
 .../actions/ActionParametersFormPanel.html         |    0
 .../actions/ActionParametersFormPanel.java         |   60 +
 .../actions/ActionParametersFormPanel.properties   |    0
 .../actions/ActionParametersFormPanelFactory.java  |    0
 .../components/actions/ActionParametersPanel.html  |    0
 .../components/actions/ActionParametersPanel.java  |  115 ++
 .../actions/ActionParametersPanelFactory.java      |    0
 .../bookmarkedpages/BookmarkedPagesPanel.css       |    0
 .../bookmarkedpages/BookmarkedPagesPanel.html      |    0
 .../bookmarkedpages/BookmarkedPagesPanel.java      |  225 +++
 .../BookmarkedPagesPanelFactory.java               |    0
 .../bookmarkedpages/images/clear_bookmarks.png     |  Bin
 .../ui/components/bookmarkedpages/slide-panel.js   |    0
 .../collection/AssociatedWithActionsHelper.java    |   84 +
 .../ui/components/collection/CollectionPanel.html  |    0
 .../ui/components/collection/CollectionPanel.java  |  215 +++
 .../collection/bulk/BulkActionsProvider.java       |    0
 .../collection/count/CollectionCountProvider.java  |    0
 .../selector/CollectionSelectorHelper.java         |  266 +++
 .../selector/CollectionSelectorPanel.html          |    0
 .../selector/CollectionSelectorPanel.java          |  233 +++
 .../selector/CollectionSelectorProvider.java       |    0
 .../CollectionContentsAsAjaxTablePanel.html        |    0
 .../CollectionContentsAsAjaxTablePanel.java        |  319 ++++
 .../CollectionContentsAsAjaxTablePanelFactory.java |    0
 .../CollectionContentsSortableDataProvider.java    |  195 +++
 .../ajaxtable/IsisAjaxFallbackDataTable.java       |  231 +++
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java  |   93 +
 .../ajaxtable/IsisAjaxFallbackOrderByBorder.java   |    0
 .../ajaxtable/IsisAjaxHeadersToolbar.html          |    0
 .../ajaxtable/IsisAjaxHeadersToolbar.java          |    0
 .../ajaxtable/IsisAjaxNavigationToolbar.html       |    0
 .../ajaxtable/IsisAjaxNavigationToolbar.java       |  123 ++
 .../ajaxtable/IsisAjaxPagingNavigation.java        |    0
 .../IsisAjaxPagingNavigationIncrementLink.java     |    0
 .../ajaxtable/IsisAjaxPagingNavigationLink.java    |    0
 .../ajaxtable/IsisAjaxPagingNavigator.java         |    0
 .../ajaxtable/IsisTotalRecordsToolbar.html         |    0
 .../ajaxtable/IsisTotalRecordsToolbar.java         |  107 ++
 .../ajaxtable/PrototypingMessageProvider.java      |   58 +
 .../ajaxtable/columns/ColumnAbstract.java          |    0
 .../columns/ObjectAdapterPropertyColumn.java       |  123 ++
 .../columns/ObjectAdapterTitleColumn.java          |   93 +
 .../columns/ObjectAdapterToggleboxColumn.java      |  128 ++
 .../ajaxtable/images/arrow_down.png                |  Bin
 .../ajaxtable/images/arrow_off.png                 |  Bin
 .../ajaxtable/images/arrow_up.png                  |  Bin
 .../icons/CollectionContentsAsIconsPanel.html      |    0
 .../icons/CollectionContentsAsIconsPanel.java      |   63 +
 .../CollectionContentsAsIconsPanelFactory.java     |   66 +
 .../CollectionContentsMultipleViewsPanel.html      |    0
 .../CollectionContentsMultipleViewsPanel.java      |    0
 ...ollectionContentsMultipleViewsPanelFactory.java |    0
 .../summary/CollectionContentsAsSummary.html       |    0
 .../summary/CollectionContentsAsSummary.java       |  206 +++
 .../CollectionContentsAsSummaryFactory.java        |   95 ++
 .../unresolved/CollectionContentsHiddenPanel.html  |    0
 .../unresolved/CollectionContentsHiddenPanel.java  |    0
 .../CollectionContentsHiddenPanelFactory.java      |    0
 .../ui/components/empty/EmptyCollectionPanel.html  |    0
 .../ui/components/empty/EmptyCollectionPanel.java  |    0
 .../empty/EmptyCollectionPanelFactory.java         |    0
 .../entity/EntityComponentFactoryAbstract.java     |   90 +
 .../entity/collection/EntityCollectionPanel.html   |    0
 .../entity/collection/EntityCollectionPanel.java   |  191 +++
 .../collection/EntityCollectionPanelFactory.java   |    0
 .../components/entity/fieldset/PropertyGroup.html  |    0
 .../components/entity/fieldset/PropertyGroup.java  |  260 +++
 .../entity/header/EntityHeaderPanel.html           |    0
 .../entity/header/EntityHeaderPanel.java           |   97 ++
 .../entity/header/EntityHeaderPanelFactory.java    |    0
 .../entity/icontitle/EntityIconAndTitlePanel.html  |    0
 .../entity/icontitle/EntityIconAndTitlePanel.java  |  239 +++
 .../icontitle/EntityIconAndTitlePanelFactory.java  |   80 +
 .../icontitle/EntityIconTitleAndCopyLinkPanel.html |    0
 .../icontitle/EntityIconTitleAndCopyLinkPanel.java |    0
 .../EntityIconTitleAndCopyLinkPanelFactory.java    |    0
 .../selector/links/EntityLinksSelectorPanel.html   |    0
 .../selector/links/EntityLinksSelectorPanel.java   |  381 +++++
 .../links/EntityLinksSelectorPanelFactory.java     |   65 +
 .../wicket/ui/components/footer/CreditImage.java   |    0
 .../wicket/ui/components/footer/CreditName.java    |    0
 .../wicket/ui/components/footer/FooterPanel.html   |    0
 .../wicket/ui/components/footer/FooterPanel.java   |  187 ++
 .../ui/components/footer/FooterPanelFactory.java   |    0
 .../wicket/ui/components/header/HeaderPanel.html   |    0
 .../wicket/ui/components/header/HeaderPanel.java   |    0
 .../ui/components/header/HeaderPanelFactory.java   |    0
 .../ui/components/layout/bs3/BS3GridPanel.html     |    0
 .../ui/components/layout/bs3/BS3GridPanel.java     |    0
 .../wicket/ui/components/layout/bs3/Util.java      |   43 +
 .../components/layout/bs3/clearfix/ClearFix.html   |    0
 .../components/layout/bs3/clearfix/ClearFix.java   |    0
 .../wicket/ui/components/layout/bs3/col/Col.html   |    0
 .../wicket/ui/components/layout/bs3/col/Col.java   |  323 ++++
 ...RepeatingViewWithDynamicallyVisibleContent.java |    0
 .../wicket/ui/components/layout/bs3/row/Row.html   |    0
 .../wicket/ui/components/layout/bs3/row/Row.java   |    0
 .../components/layout/bs3/tabs/TabGroupPanel.java  |  134 ++
 .../ui/components/layout/bs3/tabs/TabPanel.html    |    0
 .../ui/components/layout/bs3/tabs/TabPanel.java    |    0
 .../ui/components/property/PropertyEditForm.java   |    0
 .../components/property/PropertyEditFormPanel.html |    0
 .../components/property/PropertyEditFormPanel.java |    0
 .../property/PropertyEditFormPanel.properties      |    0
 .../property/PropertyEditFormPanelFactory.java     |    0
 .../ui/components/property/PropertyEditPanel.html  |    0
 .../ui/components/property/PropertyEditPanel.java  |  117 ++
 .../property/PropertyEditPanelFactory.java         |    0
 .../property/PropertyFormExecutorStrategy.java     |   85 +
 .../PropertyEditPromptHeaderPanel.html             |    0
 .../PropertyEditPromptHeaderPanel.java             |   65 +
 .../scalars/ComponentFactoryScalarAbstract.java    |    0
 .../ui/components/scalars/DateConverter.java       |    0
 .../components/scalars/DateConverterAbstract.java  |    0
 .../ui/components/scalars/DateConverterPlugin.java |    0
 .../ui/components/scalars/DateFormatSettings.java  |    0
 .../components/scalars/IsisConverterLocator.java   |  126 ++
 .../components/scalars/ScalarModelSubscriber.java  |    0
 .../components/scalars/ScalarModelSubscriber2.java |    0
 .../ui/components/scalars/ScalarPanelAbstract.java |  387 +++++
 .../components/scalars/ScalarPanelAbstract2.java   |  975 +++++++++++
 .../scalars/ScalarPanelSelect2Abstract.java        |  263 +++
 .../scalars/ScalarPanelTextFieldAbstract.html      |    0
 .../scalars/ScalarPanelTextFieldAbstract.java      |  386 +++++
 .../ScalarPanelTextFieldDatePickerAbstract.java    |  128 ++
 .../scalars/ScalarPanelTextFieldNumeric.java       |    0
 .../ScalarPanelTextFieldParseableAbstract.java     |   68 +
 .../ui/components/scalars/TextFieldAbstract.java   |    0
 .../components/scalars/TextFieldStringModel.java   |    0
 .../ui/components/scalars/TextFieldValueModel.java |   75 +
 .../ui/components/scalars/XEditableBehavior2.java  |    0
 .../scalars/datepicker/DateTimeConfig.java         |    0
 .../datepicker/TextFieldWithDateTimePicker.java    |    0
 .../datepicker/css/bootstrap-datetimepicker.css    |    0
 .../css/bootstrap-datetimepicker.min.css           |    0
 .../datepicker/js/bootstrap-datetimepicker.js      |    0
 .../datepicker/js/bootstrap-datetimepicker.min.js  |    0
 .../ui/components/scalars/datepicker/js/moment.js  |    0
 .../components/scalars/datepicker/js/moment.min.js |    0
 .../scalars/image/JavaAwtImagePanel.html           |    0
 .../scalars/image/JavaAwtImagePanel.java           |   78 +
 .../scalars/image/JavaAwtImagePanelFactory.java    |   54 +
 .../components/scalars/image/wupb-progressBar.css  |    0
 .../isisapplib/IsisBlobOrClobPanelAbstract.html    |    0
 .../isisapplib/IsisBlobOrClobPanelAbstract.java    |  434 +++++
 .../scalars/isisapplib/IsisBlobPanel.java          |    0
 .../scalars/isisapplib/IsisBlobPanelFactory.java   |    0
 .../scalars/isisapplib/IsisClobPanel.java          |    0
 .../scalars/isisapplib/IsisClobPanelFactory.java   |    0
 .../scalars/isisapplib/IsisPasswordPanel.java      |    0
 .../isisapplib/IsisPasswordPanelFactory.java       |    0
 .../scalars/isisapplib/IsisTimePanel.java          |    0
 .../scalars/isisapplib/ResourceLinkVolatile.java   |    0
 .../jdk8time/DateConverterForJdk8Abstract.java     |    0
 .../jdk8time/DateConverterForJdk8LocalDate.java    |    0
 .../DateConverterForJdk8LocalDateTime.java         |    0
 .../DateConverterForJdk8OffsetDateTime.java        |    0
 .../scalars/jdk8time/Jdk8LocalDatePanel.java       |    0
 .../jdk8time/Jdk8LocalDatePanelFactory.java        |    0
 .../scalars/jdk8time/Jdk8LocalDateTimePanel.java   |    0
 .../jdk8time/Jdk8LocalDateTimePanelFactory.java    |    0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java  |    0
 .../jdk8time/Jdk8OffsetDateTimePanelFactory.java   |    0
 .../jdkdates/DateConverterForJavaAbstract.java     |    0
 .../jdkdates/DateConverterForJavaSqlDate.java      |    0
 .../jdkdates/DateConverterForJavaSqlTimestamp.java |    0
 .../jdkdates/DateConverterForJavaUtilDate.java     |    0
 .../scalars/jdkdates/JavaSqlDatePanel.java         |    0
 .../scalars/jdkdates/JavaSqlDatePanelFactory.java  |    0
 .../scalars/jdkdates/JavaSqlTimePanel.java         |    0
 .../scalars/jdkdates/JavaSqlTimePanelFactory.java  |    0
 .../scalars/jdkdates/JavaSqlTimestampPanel.java    |    0
 .../jdkdates/JavaSqlTimestampPanelFactory.java     |    0
 .../scalars/jdkdates/JavaUtilDatePanel.java        |    0
 .../scalars/jdkdates/JavaUtilDatePanelFactory.java |    0
 .../jdkmath/BigDecimalConverterWithScale.java      |    0
 .../scalars/jdkmath/BigDecimalTextField.java       |    0
 .../scalars/jdkmath/JavaMathBigDecimalPanel.java   |    0
 .../jdkmath/JavaMathBigDecimalPanelFactory.java    |    0
 .../scalars/jdkmath/JavaMathBigIntegerPanel.java   |    0
 .../jdkmath/JavaMathBigIntegerPanelFactory.java    |    0
 .../jodatime/DateConverterForJodaAbstract.java     |    0
 .../jodatime/DateConverterForJodaDateTime.java     |    0
 .../jodatime/DateConverterForJodaLocalDate.java    |    0
 .../DateConverterForJodaLocalDateTime.java         |    0
 .../scalars/jodatime/JodaDateTimePanel.java        |    0
 .../scalars/jodatime/JodaDateTimePanelFactory.java |    0
 .../scalars/jodatime/JodaLocalDatePanel.java       |    0
 .../jodatime/JodaLocalDatePanelFactory.java        |    0
 .../scalars/jodatime/JodaLocalDateTimePanel.java   |    0
 .../jodatime/JodaLocalDateTimePanelFactory.java    |    0
 .../components/scalars/markup/MarkupComponent.java |   81 +
 .../scalars/markup/MarkupComponentFactory.java     |    0
 .../scalars/markup/MarkupComponent_reloadJs.java   |    0
 .../ui/components/scalars/markup/MarkupPanel.java  |    0
 .../scalars/markup/MarkupPanelFactories.java       |    0
 .../scalars/markup/StandaloneMarkupPanel.html      |    0
 .../scalars/markup/StandaloneMarkupPanel.java      |    0
 .../components/scalars/primitive/BooleanPanel.html |    0
 .../components/scalars/primitive/BooleanPanel.java |  262 +++
 .../scalars/primitive/BooleanPanelFactory.java     |    0
 .../primitive/BooleanPanel_labelRightPosition.html |    0
 .../ui/components/scalars/primitive/BytePanel.java |    0
 .../scalars/primitive/BytePanelFactory.java        |    0
 .../scalars/primitive/CharacterPanel.java          |    0
 .../scalars/primitive/CharacterPanelFactory.java   |    0
 .../components/scalars/primitive/DoublePanel.java  |    0
 .../scalars/primitive/DoublePanelFactory.java      |    0
 .../components/scalars/primitive/FloatPanel.java   |    0
 .../scalars/primitive/FloatPanelFactory.java       |    0
 .../components/scalars/primitive/IntegerPanel.java |    0
 .../scalars/primitive/IntegerPanelFactory.java     |    0
 .../ui/components/scalars/primitive/LongPanel.java |    0
 .../scalars/primitive/LongPanelFactory.java        |    0
 .../components/scalars/primitive/ShortPanel.java   |    0
 .../scalars/primitive/ShortPanelFactory.java       |    0
 .../scalars/reference/EntityLinkSelect2Panel.html  |    0
 .../scalars/reference/EntityLinkSelect2Panel.java  |   73 +
 .../scalars/reference/ReferencePanel.html          |    0
 .../scalars/reference/ReferencePanel.java          |  460 +++++
 .../scalars/reference/ReferencePanelFactory.java   |   58 +
 .../scalars/string/MultiLineStringPanel.java       |  113 ++
 .../ui/components/scalars/string/StringPanel.java  |    0
 .../scalars/string/StringPanelFactory.java         |   45 +
 .../ui/components/scalars/uuid/UuidConverter.java  |   63 +
 .../ui/components/scalars/uuid/UuidPanel.java      |    0
 .../components/scalars/uuid/UuidPanelFactory.java  |    0
 .../ui/components/scalars/uuid/UuidTextField.java  |    0
 .../ui/components/scalars/value/ValuePanel.java    |    0
 .../scalars/value/ValuePanelFactory.java           |   63 +
 .../valuechoices/ValueChoicesSelect2Panel.html     |    0
 .../valuechoices/ValueChoicesSelect2Panel.java     |  190 +++
 .../ValueChoicesSelect2PanelFactory.java           |    0
 .../StandaloneCollectionPanel.html                 |    0
 .../StandaloneCollectionPanel.java                 |  122 ++
 .../StandaloneCollectionPanelFactory.java          |    0
 .../components/tree/IsisToWicketTreeAdapter.java   |  530 ++++++
 .../ui/components/tree/StandaloneTreePanel.html    |    0
 .../ui/components/tree/StandaloneTreePanel.java    |    0
 .../wicket/ui/components/tree/TreePanel.html       |    0
 .../wicket/ui/components/tree/TreePanel.java       |    0
 .../ui/components/tree/TreePanelFactories.java     |    0
 .../components/tree/themes/TreeThemeProvider.java  |    0
 .../tree/themes/TreeThemeProviderDefault.java      |    0
 .../themes/bootstrap/IsisBootstrapTreeTheme.java   |    0
 .../ui/components/tree/themes/bootstrap/theme.css  |    0
 .../ui/components/unknown/UnknownModelPanel.html   |    0
 .../ui/components/unknown/UnknownModelPanel.java   |   70 +
 .../unknown/UnknownModelPanelFactory.java          |    0
 .../ui/components/value/StandaloneValuePanel.html  |    0
 .../ui/components/value/StandaloneValuePanel.java  |    0
 .../value/StandaloneValuePanelFactory.java         |    0
 .../ui/components/voidreturn/VoidReturnPanel.html  |    0
 .../ui/components/voidreturn/VoidReturnPanel.java  |    0
 .../voidreturn/VoidReturnPanelFactory.java         |    0
 .../wicket/ui/components/welcome/WelcomePanel.html |    0
 .../wicket/ui/components/welcome/WelcomePanel.java |   54 +
 .../ui/components/welcome/WelcomePanelFactory.java |    0
 .../ui/components/widgets/bootstrap/FormGroup.java |    0
 .../components/widgets/bootstrap/ModalDialog.java  |    0
 .../widgets/breadcrumbs/BreadcrumbModel.java       |  190 +++
 .../breadcrumbs/BreadcrumbModelProvider.java       |    0
 .../widgets/breadcrumbs/BreadcrumbPanel.html       |    0
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |  158 ++
 .../widgets/buttons/ContainedButtonPanel.html      |    0
 .../widgets/buttons/ContainedButtonPanel.java      |   94 +
 .../widgets/buttons/ToggleButtonsPanel.html        |    0
 .../widgets/buttons/ToggleButtonsPanel.java        |    0
 .../widgets/checkbox/ContainedToggleboxPanel.html  |    0
 .../widgets/checkbox/ContainedToggleboxPanel.java  |    0
 .../entitysimplelink/EntityLinkSimplePanel.css     |    0
 .../entitysimplelink/EntityLinkSimplePanel.html    |    0
 .../entitysimplelink/EntityLinkSimplePanel.java    |   97 ++
 .../EntityLinkSimplePanelFactory.java              |   54 +
 .../ui/components/widgets/favicon/Favicon.java     |   65 +
 .../widgets/formcomponent/CancelHintRequired.java  |    0
 .../formcomponent/FormComponentPanelAbstract.java  |    0
 .../widgets/formcomponent/FormFeedbackPanel.java   |    0
 .../widgets/linkandlabel/ActionLink.java           |  284 ++++
 .../widgets/linkandlabel/ActionLinkFactory.java    |   38 +
 .../linkandlabel/ActionLinkFactoryAbstract.java    |  319 ++++
 .../linkandlabel/AjaxDeferredBehaviour.java        |    0
 .../ui/components/widgets/navbar/BrandLogo.java    |   72 +
 .../ui/components/widgets/navbar/BrandName.java    |   68 +
 .../ui/components/widgets/navbar/Placement.java    |    0
 .../ui/components/widgets/select2/ChoiceExt.java   |   40 +
 .../ui/components/widgets/select2/Select2.java     |    0
 .../select2/Select2BootstrapCssReference.java      |   48 +
 .../widgets/select2/Select2ChoiceExt.java          |   58 +
 .../widgets/select2/Select2JsReference.java        |   48 +
 .../widgets/select2/Select2MultiChoiceExt.java     |   67 +
 .../select2/providers/EmptyChoiceProvider.java     |    0
 .../ObjectAdapterMementoProviderAbstract.java      |  173 ++
 .../ObjectAdapterMementoProviderForChoices.java    |    0
 ...tAdapterMementoProviderForReferenceChoices.java |    0
 ...entoProviderForReferenceObjectAutoComplete.java |   51 +
 ...derForReferenceParamOrPropertyAutoComplete.java |   75 +
 ...bjectAdapterMementoProviderForValueChoices.java |   66 +
 .../widgets/select2/select2-bootstrap.css          |    0
 .../themepicker/IsisWicketThemeSupport.java        |   64 +
 .../themepicker/IsisWicketThemeSupportDefault.java |  136 ++
 .../widgets/themepicker/ThemeChooser.html          |    0
 .../widgets/themepicker/ThemeChooser.java          |  162 ++
 .../themepicker/ThemeProviderComposite.java        |  114 ++
 .../widgets/zclip/SimpleClipboardModalWindow.html  |    0
 .../widgets/zclip/SimpleClipboardModalWindow.java  |    0
 .../zclip/SimpleClipboardModalWindowForm.java      |    0
 .../zclip/SimpleClipboardModalWindowPanel.html     |    0
 .../zclip/SimpleClipboardModalWindowPanel.java     |    0
 .../widgets/zclip/ZeroClipboardPanel.html          |    0
 .../widgets/zclip/ZeroClipboardPanel.java          |  126 ++
 .../viewer/wicket/ui/errors/ExceptionModel.java    |  193 +++
 .../wicket/ui/errors/ExceptionStackTracePanel.css  |    0
 .../wicket/ui/errors/ExceptionStackTracePanel.html |    0
 .../wicket/ui/errors/ExceptionStackTracePanel.java |    0
 .../viewer/wicket/ui/errors/JGrowlBehaviour.java   |   86 +
 .../isis/viewer/wicket/ui/errors/JGrowlUtil.java   |    0
 .../viewer/wicket/ui/errors/StackTraceDetail.java  |    0
 .../wicket/ui/errors/StackTraceListView.java       |    0
 .../isis/viewer/wicket/ui/errors/div-toggle.js     |    0
 .../viewer/wicket/ui/errors/js/bootstrap-growl.js  |    0
 .../wicket/ui/errors/js/bootstrap-growl.min.js     |    0
 .../ui/pages/BookmarkedPagesModelProvider.java     |    0
 .../BootstrapOverridesCssResourceReference.java    |    0
 .../ui/pages/EmailVerificationUrlService.java      |    0
 .../isis/viewer/wicket/ui/pages/PageAbstract.html  |    0
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  524 ++++++
 .../viewer/wicket/ui/pages/PageAbstract.properties |    0
 .../isis/viewer/wicket/ui/pages/PageClassList.java |    0
 .../viewer/wicket/ui/pages/PageClassRegistry.java  |    0
 .../wicket/ui/pages/PageClassRegistryAccessor.java |    0
 .../wicket/ui/pages/PageClassRegistrySpi.java      |    0
 .../wicket/ui/pages/PageNavigationService.java     |    0
 .../ui/pages/SidebarCssResourceReference.java      |    0
 .../isis/viewer/wicket/ui/pages/WebPageBase.java   |   77 +
 .../viewer/wicket/ui/pages/about/AboutPage.css     |    0
 .../viewer/wicket/ui/pages/about/AboutPage.html    |    0
 .../viewer/wicket/ui/pages/about/AboutPage.java    |    0
 .../ui/pages/accmngt/AccountConfirmationMap.java   |    0
 .../accmngt/AccountManagementPageAbstract.html     |    0
 .../accmngt/AccountManagementPageAbstract.java     |    0
 .../AccountManagementPageAbstract.properties       |    0
 .../ui/pages/accmngt/EmailAvailableValidator.java  |    0
 .../EmailVerificationUrlServiceDefault.java        |    0
 .../pages/accmngt/UsernameAvailableValidator.java  |    0
 .../password_reset/PasswordResetEmailPanel.html    |    0
 .../password_reset/PasswordResetEmailPanel.java    |    0
 .../accmngt/password_reset/PasswordResetPage.css   |    0
 .../accmngt/password_reset/PasswordResetPage.html  |    0
 .../accmngt/password_reset/PasswordResetPage.java  |    0
 .../accmngt/password_reset/PasswordResetPanel.html |    0
 .../accmngt/password_reset/PasswordResetPanel.java |    0
 .../ui/pages/accmngt/register/RegisterPage.css     |    0
 .../ui/pages/accmngt/register/RegisterPage.html    |    0
 .../ui/pages/accmngt/register/RegisterPage.java    |    0
 .../ui/pages/accmngt/register/RegisterPanel.html   |    0
 .../ui/pages/accmngt/register/RegisterPanel.java   |    0
 .../pages/accmngt/signup/RegistrationFormPage.css  |    0
 .../pages/accmngt/signup/RegistrationFormPage.html |    0
 .../pages/accmngt/signup/RegistrationFormPage.java |    0
 .../accmngt/signup/RegistrationFormPanel.html      |    0
 .../accmngt/signup/RegistrationFormPanel.java      |  128 ++
 .../ui/pages/actionprompt/ActionPromptPage.css     |    0
 .../ui/pages/actionprompt/ActionPromptPage.html    |    0
 .../ui/pages/actionprompt/ActionPromptPage.java    |    0
 .../wicket/ui/pages/bootstrap-overrides-all-v1.css |    0
 .../wicket/ui/pages/bootstrap-overrides-all-v2.css |    0
 .../pages/bootstrap-overrides-bootstrap-theme.css  |    0
 .../ui/pages/bootstrap-overrides-cerulean.css      |    0
 .../wicket/ui/pages/bootstrap-overrides-cosmo.css  |    0
 .../wicket/ui/pages/bootstrap-overrides-cyborg.css |    0
 .../wicket/ui/pages/bootstrap-overrides-darkly.css |    0
 .../wicket/ui/pages/bootstrap-overrides-flatly.css |    0
 .../ui/pages/bootstrap-overrides-journal.css       |    0
 .../wicket/ui/pages/bootstrap-overrides-lumen.css  |    0
 .../wicket/ui/pages/bootstrap-overrides-paper.css  |    0
 .../ui/pages/bootstrap-overrides-readable.css      |    0
 .../ui/pages/bootstrap-overrides-sandstone.css     |    0
 .../ui/pages/bootstrap-overrides-simplex.css       |    0
 .../wicket/ui/pages/bootstrap-overrides-slate.css  |    0
 .../ui/pages/bootstrap-overrides-spacelab.css      |    0
 .../ui/pages/bootstrap-overrides-superhero.css     |    0
 .../wicket/ui/pages/bootstrap-overrides-united.css |    0
 .../wicket/ui/pages/bootstrap-overrides-yeti.css   |    0
 .../apache/isis/viewer/wicket/ui/pages/copy-26.png |  Bin
 .../viewer/wicket/ui/pages/entity/EntityPage.css   |    0
 .../viewer/wicket/ui/pages/entity/EntityPage.html  |    0
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |  240 +++
 .../viewer/wicket/ui/pages/error/ErrorPage.css     |    0
 .../viewer/wicket/ui/pages/error/ErrorPage.html    |    0
 .../viewer/wicket/ui/pages/error/ErrorPage.java    |   91 +
 .../isis/viewer/wicket/ui/pages/home/HomePage.css  |    0
 .../isis/viewer/wicket/ui/pages/home/HomePage.html |    0
 .../isis/viewer/wicket/ui/pages/home/HomePage.java |    0
 .../wicket/ui/pages/images/bg_header_brown.png     |  Bin
 .../viewer/wicket/ui/pages/images/icon_appuser.png |  Bin
 .../isis/viewer/wicket/ui/pages/images/logo.pdn    |  Bin
 .../isis/viewer/wicket/ui/pages/images/logo.png    |  Bin
 .../isis-wicket-theme/images/animated-overlay.gif  |  Bin
 .../images/ui-bg_flat_0_aaaaaa_40x100.png          |  Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png         |  Bin
 .../images/ui-bg_glass_55_40c0cb_1x400.png         |  Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png         |  Bin
 .../images/ui-bg_glass_75_dadada_1x400.png         |  Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png         |  Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png         |  Bin
 .../ui-bg_highlight-soft_75_20B5C2_1x100.png       |  Bin
 .../images/ui-icons_00477F_256x240.png             |  Bin
 .../images/ui-icons_2e83ff_256x240.png             |  Bin
 .../images/ui-icons_454545_256x240.png             |  Bin
 .../images/ui-icons_888888_256x240.png             |  Bin
 .../images/ui-icons_F0EFEA_256x240.png             |  Bin
 .../images/ui-icons_cd0a0a_256x240.png             |  Bin
 .../wicket/ui/pages/jquery.isis.wicket.viewer.js   |    0
 .../viewer/wicket/ui/pages/jquery.livequery.js     |    0
 .../wicket/ui/pages/login/IsisSignInPanel.html     |    0
 .../wicket/ui/pages/login/IsisSignInPanel.java     |  170 ++
 .../wicket/ui/pages/login/WicketLogoutPage.java    |    0
 .../wicket/ui/pages/login/WicketSignInPage.css     |    0
 .../wicket/ui/pages/login/WicketSignInPage.html    |    0
 .../wicket/ui/pages/login/WicketSignInPage.java    |    0
 .../ui/pages/login/WicketSignInPage.properties     |    0
 .../wicket/ui/pages/mmverror/MmvErrorPage.css      |    0
 .../wicket/ui/pages/mmverror/MmvErrorPage.html     |    0
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |  114 ++
 .../isis/viewer/wicket/ui/pages/simple-sidebar.css |    0
 .../isis/viewer/wicket/ui/pages/spinning-icon.gif  |  Bin
 .../StandaloneCollectionPage.css                   |    0
 .../StandaloneCollectionPage.html                  |    0
 .../StandaloneCollectionPage.java                  |    0
 .../viewer/wicket/ui/pages/value/ValuePage.css     |    0
 .../viewer/wicket/ui/pages/value/ValuePage.html    |    0
 .../viewer/wicket/ui/pages/value/ValuePage.java    |    0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.css  |    0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.html |    0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.java |    0
 .../wicket/ui/pages/wicket-xhtml1.4-strict.dtd     |    0
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |   89 +
 .../wicket/ui/panels/FormExecutorDefault.java      |  547 ++++++
 .../wicket/ui/panels/FormExecutorStrategy.java     |   41 +
 .../ui/panels/HasDynamicallyVisibleContent.java    |    0
 .../panels/IFormSubmitterWithPreValidateHook.java  |    0
 .../viewer/wicket/ui/panels/PanelAbstract.java     |    0
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  162 ++
 .../isis/viewer/wicket/ui/panels/PanelUtil.java    |  116 ++
 .../wicket/ui/panels/PromptFormAbstract.java       |  378 ++++
 .../wicket/ui/panels/PromptFormPanelAbstract.java  |    0
 .../isis/viewer/wicket/ui/util/Components.java     |  118 ++
 .../viewer/wicket/ui/util/CssClassAppender.java    |   76 +
 .../viewer/wicket/ui/util/CssClassRemover.java     |   51 +
 .../isis/viewer/wicket/ui/util/CssIdAppender.java  |   70 +
 .../apache/isis/viewer/wicket/ui/util/Links.java   |    0
 .../isis/viewer/wicket/ui/util/SSESupport.java     |    0
 .../isis/viewer/wicket/ui/util/SSESupport.js       |    0
 .../isis/viewer/wicket/ui/util/Tooltips.java       |   84 +
 .../isis/viewer/wicket/ui/util/isis-tooltips.css   |    0
 .../viewer/wicket/ui/validation/ValidatorBase.java |    0
 .../ui/src/main/resources/images/Default.png       |  Bin
 .../ui/ComponentFactoryAbstractTest_init.java      |  128 ++
 .../wicket/ui/ComponentType_ConstantsTest.java     |    0
 ...ollectionContentsSelectorDropdownPanelTest.java |   79 +
 .../EntityIconAndTitlePanelTest_abbreviated.java   |    0
 .../jdkdates/DateConverterForJavaSqlDateTest.java  |    0
 .../jdkdates/DateConverterForJavaUtilDateTest.java |    0
 ...BigDecimalConverterWithScaleTest_roundtrip.java |    0
 .../jodatime/DateConverterForJodaDateTimeTest.java |    0
 .../DateConverterForJodaLocalDateTest.java         |    0
 .../DateConverterForJodaLocalDateTimeTest.java     |    0
 .../DateConverterForJdk8LocalDateTest.java         |    0
 .../DateConverterForJdk8LocalDateTimeTest.java     |    0
 .../DateConverterForJdk8OffsetDateTimeTest.java    |    0
 .../scalars/uuid/UuidConverterTest_roundtrip.java  |    0
 ...tAdapterMementoProviderForValueChoicesTest.java |  116 ++
 .../viewer/wicket/ui/errors/JGrowlUtilTest.java    |    0
 .../isis/viewer/wicket/ui/fixtures/Customers.java  |    0
 .../viewer/wicket/ui/pages/PageAbstractTest.java   |    0
 viewers/wicket/viewer/pom.xml                      |  184 ++
 .../wicket/viewer/IsisModuleWicketViewer.java      |    0
 .../integration/AnonymousWebSessionForIsis.java    |    0
 .../AuthenticatedWebSessionForIsis.java            |    0
 .../integration/ConverterForObjectAdapter.java     |   85 +
 .../ConverterForObjectAdapterMemento.java          |   79 +
 .../viewer/integration/IsisResourceSettings.java   |    0
 .../viewer/integration/LocalizerForIsis.java       |  149 ++
 .../viewer/integration/WebRequestCycleForIsis.java |  404 +++++
 .../wicket/viewer/mixins/Object_clearHints.java    |    0
 .../ComponentFactoryRegistrarDefault.java          |  305 ++++
 .../ComponentFactoryRegistryDefault.java           |  200 +++
 .../registries/pages/PageClassListDefault.java     |    0
 .../registries/pages/PageClassRegistryDefault.java |   93 +
 .../pages/PageNavigationServiceDefault.java        |    0
 .../viewer/services/BookmarkUiServiceWicket.java   |    0
 .../viewer/services/DeepLinkServiceWicket.java     |   76 +
 .../services/HintStoreUsingWicketSession.java      |  112 ++
 .../services/ImageResourceCacheClassPath.java      |  301 ++++
 .../viewer/services/LocaleProviderWicket.java      |    0
 .../services/TranslationsResolverWicket.java       |  111 ++
 .../services/WicketViewerSettingsDefault.java      |  114 ++
 .../viewer/services/mementos/CollectionData.java   |   55 +
 .../wicket/viewer/services/mementos/Data.java      |   47 +
 .../viewer/services/mementos/ObjectData.java       |   77 +
 .../viewer/services/mementos/ObjectMarshaller.java |  153 ++
 .../services/mementos/ObjectMementoLegacy.java     |  648 +++++++
 .../mementos/ObjectMementoServiceWicket.java       |  165 ++
 .../services/mementos/ObjectUnmarshaller.java      |  298 ++++
 .../viewer/services/mementos/StandaloneData.java   |   70 +
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  115 ++
 .../viewer/wicketapp/IsisWicketApplication.java    |  618 +++++++
 .../IsisWicketApplication_Experimental.java        |  107 ++
 .../IsisWicketApplication_newPageFactory.java      |   95 ++
 .../IsisWicketApplication_newSession.java          |    0
 ...rgetRespondListenerToResetQueryResultCache.java |    0
 .../viewer/src/main/resources/log4j.properties     |    0
 ...uthenticatedWebSessionForIsis_Authenticate.java |    0
 ...ionForIsis_DownCastsInheritedFunctionality.java |    0
 ...thenticatedWebSessionForIsis_Instantiation.java |    0
 ...ticatedWebSessionForIsis_NotYetImplemented.java |    0
 .../AuthenticatedWebSessionForIsis_SignIn.java     |    0
 ...uthenticatedWebSessionForIsis_TestAbstract.java |    0
 .../pages/PageClassListDefault_Instantiation.java  |    0
 ...ageClassListDefault_RegistrationAndCaching.java |    0
 .../viewer/services/ImageResourceCacheKeyTest.java |    0
 .../services/TranslationsResolverWicketTest.java   |    0
 .../wicketapp/IsisWicketApplication_Defaults.java  |   79 +
 .../wicketapp/IsisWicketApplication_Pages.java     |    0
 6588 files changed, 220129 insertions(+), 220058 deletions(-)
 rename {core/viewers/restfulobjects/jaxrs-resteasy-4 => api/applib}/.gitignore (100%)
 create mode 100644 api/applib/pom.xml
 rename {core/schema => api/applib}/src/main/doc/antora.yml (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/examples.sh (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Action.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ActionLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Auditing.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/BookmarkPolicy.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Bounding.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Collection.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CollectionLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandExecuteIn.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandPersistence.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandReification.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Constants.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Contributed.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainObject.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainObjectLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainServiceLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Editing.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/EqualByContent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Facets.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/HomePage.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/LabelPosition.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MemberOrder.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MementoSerialization.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MinLength.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Mixin.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Module.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Nature.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/NatureOfService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Navigable.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Optionality.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/OrderPrecedence.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Parameter.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ParameterLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Programmatic.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Projecting.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PromptStyle.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Property.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PropertyLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Publishing.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PublishingChangeKind.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Redirect.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/RenderDay.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Repainting.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/RestrictTo.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/SemanticsOf.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Title.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ViewModel.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ViewModelLayout.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Where.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/package-info.java (100%)
 rename {core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4 => api/applib/src/main/doc/modules/applib-ant}/images/.gitkeep (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout => api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout}/bookmarking.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout => api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout}/bookmarking.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-ant}/nav.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Column.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Title.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples.sh (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/clock/Clock.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/clock/package-info.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ActionArgumentUsabilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ActionArgumentVisibilityEvent.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/ActionDomainEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/CollectionDomainEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/EventObjectBase.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/PropertyDomainEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/AbstractLifecycleEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectCreatedEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectLoadedEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectPersistedEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectPersistingEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectRemovingEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectUpdatedEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectUpdatingEvent.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/CssClassUiEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/IconUiEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/LayoutUiEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/TitleUiEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ActionLayoutData.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ActionLayoutDataOwner.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/CollectionLayoutDataOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/DomainObjectLayoutData.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/DomainObjectLayoutDataOwner.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/FieldSetOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasBookmarking.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasCssClass.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasCssClassFa.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasDescribedAs.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasHidden.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasNamed.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/MemberRegion.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/MemberRegionOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/Owned.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/Owner.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ServiceActionLayoutData.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ServiceActionLayoutDataOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/Grid.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFix.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3Element.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowContent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowOwner.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3TabOwner.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/HasCssId.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/Size.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/SizeSpan.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/WithinGrid.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/links/Link.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/links/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/Menu.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuBar.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuBars.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuSection.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/bootstrap3/BS3MenuBars.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/bootstrap3/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/MixinConstants.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/Dto.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/DtoMappingHelper.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/Dto_downloadXml.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_downloadLayoutXml.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_openRestApi.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_rebuildMetamodel.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_objectIdentifier.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_objectType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/HoldsUpdatedAt.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/HoldsUpdatedBy.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/Timestampable.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/RoleMemento.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/UserMemento.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/AbstractSpecification.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/AbstractSpecification2.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/Specification.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/Specification2.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationAnd.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationNot.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationOr.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/LazyTreeNode.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeAdapter.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorBreadthFirst.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorDepthFirst.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorHierarchyUp.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreePath.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreePath_Default.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeState.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeState_Default.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/Enums.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/Equality.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/Hashing.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/JaxbAdapters.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/JaxbUtil.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContract_Empty.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContract_Impl.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContract_Parser.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContracts.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ReasonBuffer.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ReasonBuffer2.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/Reasons.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/TitleBuffer.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/TitleBufferException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ToString.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/schema/ChangesDtoUtils.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/schema/CommandDtoUtils.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/schema/CommonDtoUtils.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/schema/InteractionDtoUtils.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/schema/MemberExecutionDtoUtils.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Blob.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/BlobClobFactory.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Clob.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Image.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/LocalResourcePath.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Markup.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/NamedWithMimeType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Password.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/package-info.java (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-classes/issue-in-more-detail.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/prefixes/choices/dependent.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/differing.pdn (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/differing.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/png-files.png (100%)
 rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/value-types/markup.png (100%)
 rename {core/applib/src/main/doc/modules/applib-svc => api/applib/src/main/doc/modules/applib-cm}/nav.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/about.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/examples.sh (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/HasUniqueId.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/HasUsername.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/RepresentsInteractionMemberExecution.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/WithTransactionScope.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/acceptheader/AcceptHeaderService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/appfeat/ApplicationFeatureRepository.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/appfeat/ApplicationMemberType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/appfeat/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditEntryPropertyIdType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditEntryPropertyValueType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditerService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditerServiceLogging.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/background/BackgroundCommandService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/background/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/Bookmark.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder_lookup.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder_object.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmarkui/BookmarkUiService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/clock/ClockService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/clock/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/Command.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandContext.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDefault.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessor.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessorForActionAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessorForPropertyAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandExecutorService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandWithDto.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/spi/CommandService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationMenu.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationProperty.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationProperty.layout.xml (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationProperty.png (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationViewService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/ContentMappingService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/ContentMappingServiceForCommandDto.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/ContentMappingServiceForCommandsDto.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/spi/CommandDtoProcessorService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/email/EmailService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/email/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/ErrorDetails.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/ErrorReportingService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/Ticket.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/eventbus/EventBusService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/eventbus/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/ExceptionRecognizer.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/ExceptionRecognizerAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/ExceptionRecognizerComposite.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/ExceptionRecognizerForType.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/TranslatableException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/factory/FactoryService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/factory/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridLoaderService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridSystemService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/health/Health.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/health/HealthCheckService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/hint/HintStore.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/hint/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/LocaleProvider.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/TranslatableString.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/TranslationService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/TranslationsResolver.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/iactn/Interaction.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/iactn/InteractionContext.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/iactn/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/inject/ServiceInjector.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/CatalogingSchemaOutputResolver.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/JaxbService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/JaxbServiceDefault.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/StreamResultWithWriter.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/layout/LayoutService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/layout/LayoutServiceMenu.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/layout/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/linking/DeepLinkService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/linking/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/menu/MenuBarsLoaderService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/menu/MenuBarsService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/message/MessageService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/message/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/DomainMember.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/DomainModel.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/MetaModelService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/MetaModelServicesMenu.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metrics/MetricsService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metrics/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublishedObjects.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublisherService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublisherServiceLogging.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/QueryResultCacheControl.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/QueryResultsCache.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/QueryResultsCacheDefault.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/registry/ServiceRegistry.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/registry/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/repository/RepositoryService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/repository/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/routing/RoutingService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/routing/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/scratchpad/Scratchpad.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/scratchpad/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/session/SessionLoggingService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/session/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sessmgmt/SessionManagementService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sessmgmt/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sudo/SudoService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sudo/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/swagger/SwaggerService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/swagger/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/tablecol/TableColumnOrderService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/title/TitleService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/title/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/urlencoding/UrlEncodingService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/urlencoding/UrlEncodingServiceWithCompression.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/urlencoding/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/user/UserService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/user/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userprof/UserProfileService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userprof/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/EmailNotificationService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/UserDetails.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/UserRegistrationService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/EmailEventAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/EmailRegistrationEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/PasswordResetEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/AsyncWrap.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/DisabledException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/HiddenException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/InteractionException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/InvalidException.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/WrapperFactory.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/WrappingObject.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/AccessEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionArgumentEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionInvocationEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionUsabilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionVisibilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionAccessEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionAddToEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionMethodEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionRemoveFromEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionUsabilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionVisibilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/InteractionEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectTitleEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectValidityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectVisibilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ParseValueEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyAccessEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyModifyEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyUsabilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyVisibilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ProposedHolderEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/UsabilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ValidityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/VisibilityEvent.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/listeners/InteractionAdapter.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/listeners/InteractionListener.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/Transaction.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionId.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionState.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/package-info.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/XmlSnapshotService.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/XmlSnapshotServiceAbstract.java (100%)
 rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/package-info.java (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/applib/src/main/doc/modules/applib-svc}/nav.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/about.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc (100%)
 rename {core => api}/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/AbstractService.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/ApplicationException.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/FatalException.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/Identifier.java
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/RepositoryException.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/ViewModel.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Action.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ActionLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Auditing.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/BookmarkPolicy.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Bounding.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Collection.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CollectionLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandExecuteIn.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandPersistence.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandReification.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Constants.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Contributed.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainObject.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainObjectLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainServiceLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Editing.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/EqualByContent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Facets.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/HomePage.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/LabelPosition.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MemberOrder.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MementoSerialization.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MinLength.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Mixin.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Module.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Nature.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/NatureOfService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Navigable.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Optionality.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/OrderPrecedence.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Parameter.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ParameterLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Programmatic.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Projecting.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PromptStyle.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Property.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PropertyLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Publishing.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PublishingChangeKind.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Redirect.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/RenderDay.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Repainting.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/RestrictTo.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/SemanticsOf.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Title.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/annotation/Value.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ViewModel.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ViewModelLayout.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Where.java (100%)
 rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/clock/Clock.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/clock/package-info.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ActionArgumentUsabilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ActionArgumentVisibilityEvent.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/ActionDomainEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/CollectionDomainEvent.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/PropertyDomainEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/AbstractLifecycleEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectCreatedEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectLoadedEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectPersistedEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectPersistingEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectRemovingEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectUpdatedEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectUpdatingEvent.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/CssClassUiEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/IconUiEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/LayoutUiEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/TitleUiEvent.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ActionLayoutData.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ActionLayoutDataOwner.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/CollectionLayoutDataOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/DomainObjectLayoutData.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/DomainObjectLayoutDataOwner.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/FieldSetOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasBookmarking.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasCssClass.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasCssClassFa.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasDescribedAs.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasHidden.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasNamed.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/MemberRegion.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/MemberRegionOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/Owned.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/Owner.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ServiceActionLayoutData.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ServiceActionLayoutDataOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/Grid.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFix.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3Element.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowContent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowOwner.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3TabOwner.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/HasCssId.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/Size.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/SizeSpan.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/WithinGrid.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/links/Link.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/links/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/Menu.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuBar.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuBars.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuSection.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/bootstrap3/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/MixinConstants.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/Dto.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/Dto_downloadXml.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_downloadLayoutXml.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_openRestApi.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_rebuildMetamodel.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_objectIdentifier.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_objectType.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/HoldsUpdatedAt.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/HoldsUpdatedBy.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/Timestampable.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/package-info.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/package-info.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/Query.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/RoleMemento.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/UserMemento.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/HasUniqueId.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/HasUsername.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/RepresentsInteractionMemberExecution.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/WithTransactionScope.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/acceptheader/AcceptHeaderService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/appfeat/ApplicationFeatureRepository.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/appfeat/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditEntryPropertyIdType.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditEntryPropertyValueType.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditerService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditerServiceLogging.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/background/BackgroundCommandService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/background/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder_lookup.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder_object.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmarkui/BookmarkUiService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/clock/ClockService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/clock/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/Command.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandContext.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDefault.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessor.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessorForActionAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessorForPropertyAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandExecutorService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandWithDto.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/spi/CommandService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationMenu.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationProperty.layout.xml (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationProperty.png (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationViewService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/ContentMappingServiceForCommandDto.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/ContentMappingServiceForCommandsDto.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/spi/CommandDtoProcessorService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/email/EmailService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/email/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/ErrorDetails.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/ErrorReportingService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/Ticket.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/eventbus/EventBusService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/eventbus/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/ExceptionRecognizer.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/TranslatableException.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/factory/FactoryService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/factory/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridLoaderService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridSystemService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/health/Health.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/health/HealthCheckService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/hint/HintStore.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/hint/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/LocaleProvider.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/TranslationService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/TranslationsResolver.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/iactn/InteractionContext.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/iactn/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/inject/ServiceInjector.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/JaxbServiceDefault.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/StreamResultWithWriter.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/layout/LayoutService.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/layout/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/linking/DeepLinkService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/linking/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/menu/MenuBarsLoaderService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/menu/MenuBarsService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/message/MessageService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/message/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/DomainMember.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/DomainModel.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metrics/MetricsService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metrics/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublishedObjects.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublisherService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublisherServiceLogging.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/QueryResultCacheControl.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/QueryResultsCache.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/registry/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/repository/RepositoryService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/repository/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/routing/RoutingService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/routing/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/scratchpad/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/session/SessionLoggingService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/session/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sessmgmt/SessionManagementService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sessmgmt/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sudo/SudoService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sudo/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/swagger/SwaggerService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/swagger/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/tablecol/TableColumnOrderService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/title/TitleService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/title/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/urlencoding/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/user/UserService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/user/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userprof/UserProfileService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userprof/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/EmailNotificationService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/UserDetails.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/UserRegistrationService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/EmailEventAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/EmailRegistrationEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/PasswordResetEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/AsyncWrap.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/DisabledException.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/HiddenException.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/InteractionException.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/InvalidException.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/WrapperFactory.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/WrappingObject.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/AccessEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionArgumentEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionInvocationEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionUsabilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionVisibilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionAccessEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionAddToEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionMethodEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionRemoveFromEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionUsabilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionVisibilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/InteractionEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectTitleEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectValidityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectVisibilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ParseValueEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyAccessEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyModifyEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyUsabilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyVisibilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ProposedHolderEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/UsabilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ValidityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/VisibilityEvent.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/listeners/InteractionAdapter.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/listeners/InteractionListener.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/Transaction.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionId.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionState.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/XmlSnapshotService.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/XmlSnapshotServiceAbstract.java (100%)
 rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/package-info.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/AbstractSpecification.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/Specification.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/Specification2.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationAnd.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationNot.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationOr.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeAdapter.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorBreadthFirst.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorDepthFirst.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorHierarchyUp.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreePath.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreePath_Default.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeState.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeState_Default.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java (100%)
 rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ObjectContract_Empty.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ObjectContract_Impl.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ReasonBuffer.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/Reasons.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/TitleBufferException.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/package-info.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Blob.java (100%)
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Clob.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Image.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/LocalResourcePath.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Markup.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/NamedWithMimeType.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Password.java (100%)
 rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/package-info.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java (100%)
 create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java (100%)
 create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/Invoice.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/Numbered.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java (100%)
 create mode 100644 api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java (100%)
 rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/TestClock.java (100%)
 rename {core/testsupport/unittestsupport => api/schema}/.gitignore (100%)
 create mode 100644 api/schema/pom.xml
 rename {core/applib => api/schema}/src/main/doc/antora.yml (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-classes/issue-in-more-detail.png (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/prefixes/choices/dependent.png (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/differing.pdn (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/differing.png (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/png-files.png (100%)
 rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/value-types/markup.png (100%)
 rename {core/applib/src/main/doc/modules/applib-ant => api/schema/src/main/doc/modules/schema}/nav.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/about.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/aim.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/chg.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/cmd.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/common.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/ixn.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/pages/mml.adoc (100%)
 rename {core => api}/schema/src/main/doc/modules/schema/partials/module-nav.adoc (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java (100%)
 rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/bindings.xml (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd (100%)
 rename {core => api}/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd (100%)
 delete mode 100644 core/applib/pom.xml
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
 delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/Identifier.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
 delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
 delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
 delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
 delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
 delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
 delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
 create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
 create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
 create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
 delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
 create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/DataNucleusAutoCreate.properties (100%)
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/DebugDiscovery.properties (100%)
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/DebugPersistence.properties (100%)
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/H2InMemory.properties (100%)
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/H2InMemory_withUniqueSchema.properties (100%)
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/HsqlDbInMemory.properties (100%)
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/IsisIntegTest.properties (100%)
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/NoTranslations.properties (100%)
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/SilenceWicket.properties (100%)
 rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/UseLog4j2Test.properties (100%)
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
 create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
 delete mode 100644 core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
 create mode 100644 core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
 delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
 create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
 create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
 create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
 create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
 create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
 delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
 delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
 delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
 delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectNotFoundException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectPersistenceException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRecreationException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRefreshException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanBeVoid.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassFunctions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassPredicates.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CloseableExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/DateExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/InputStreamExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/LocaleUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MapUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodInvocationPreprocessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ObjectExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ResourceUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ToString.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/Wormhole.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/package-info.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInitiatedBy.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContextAware.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetWithAttributes.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/CollectionUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DependentArgUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethodParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetMulti.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFinderUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodLiteralConstants.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectSpecIdFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/OrphanedSupportingMethodValidator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PostConstructMethodCache.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/ElementSpecificationProviderFromTypeOfFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/associateWith/AssociatedWithFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/associateWith/AssociatedWithFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/associateWith/AssociatedWithFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/HomePageFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/HomePageFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/HomePageFacetImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/deficiencies/DeficiencyFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/describedas/DescribedAsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/describedas/DescribedAsFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/help/HelpFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/help/HelpFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/DescribedAsFacetTranslated.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/NamedFacetTranslated.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/PluralFacetTranslated.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/NamedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/NamedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/NamedFacetInferred.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/clear/CollectionClearFacetViaAccessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/clear/CollectionClearFacetViaClearMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/defaultview/DefaultViewFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/defaultview/DefaultViewFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/notpersisted/NotPersistedFacetForCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/typeof/TypeOfFacetOnCollectionFromCollectionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutable.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/TypeOfFacetInferredFromSupportingMethods.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/parented/ParentedCollectionFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/SortedByFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/SortedByFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemantics.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemanticsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemanticsFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/ActionChoicesFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/ActionDefaultsFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/DescribedAsFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/HelpFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MultiLineFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/NamedFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/NamedFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/PagedFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlAccessorTypeFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlAccessorTypeFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlAccessorTypeFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlTransientFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlTransientFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlTransientFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacetAbstract2.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegex.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaPosition.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromProperties.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberDerivedFromType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFromProperties.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstractAlwaysEverywhere.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetForContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetForActionAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetProperties.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/QueryFindAllChoices.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/ChoicesFacetEnum.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/method/CssClassFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultsProviderUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/domainevents/ActionDomainEventDefaultFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/domainevents/CollectionDomainEventDefaultFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/entity/EntityFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/annotation/FacetsFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/annotation/FacetsFacetAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/method/IconFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/IteratorFilteringFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layout/LayoutFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layout/LayoutFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layout/LayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layout/LayoutFacetFallback.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layout/LayoutFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromIoCNamingStrategy.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/PagedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/PagedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetForPagedAnnotationOnType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/ParentedCollectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/ParentedCollectionFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/InvalidEntryException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/TextEntryParseException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/inferred/PluralFacetInferred.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetDerivedFromProjectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetDerivedFromProjectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetDerivedFromProjectionFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetFallBackToInline.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromViewModelFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectInterface.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/Util.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/EqualByContentFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/EqualByContentFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/EqualByContentFacetViaValueSemantics.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ImmutableFacetViaValueSemantics.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/MaxLengthFacetUsingParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/TypicalLengthFacetUsingParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetSimple.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/choices/ChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/choices/ChoicesFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/fileaccept/FileAcceptFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/fileaccept/FileAcceptFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetInferredFromMultiLineFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/SpecificationEvaluator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/renderedadjusted/RenderedAdjustedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/renderedadjusted/RenderedAdjustedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/MinLengthUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/BigDecimalFacetOnParameterFromJavaxValidationAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/BigDecimalFacetOnParameterFromJavaxValidationDigitsAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionChoicesFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFacets.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/fromtype/ActionParameterDefaultFacetDerivedFromTypeFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/describedas/annotderived/DescribedAsFacetOnParameterDerivedFromType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/ActionParameterDisabledFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/ActionParameterHiddenFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/LabelAtFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/MultiLineFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/RenderedAdjustedFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/TypicalLengthFacetForParameterLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/mandatory/dflt/MandatoryFacetOnParametersDefaultFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/NamedFacetForParameterUsingReflection.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetFactoryUsingReflection.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/maxlen/MaxLengthFacetForParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/accessor/PropertyOrCollectionAccessorFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/PropertyAutoCompleteFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/BigDecimalFacetOnPropertyFromJavaxValidationDigitsAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/BigDecimalFacetOnPropertyFromJavaxValidationDigitsAnnotationFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/PropertyDefaultFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/PropertyDefaultFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromDefaultedFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutable.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferred.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetFromPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotationInvertedSemantics.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetInvertedByNullableAnnotationOnProperty.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/maxlength/MaxLengthFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/Utils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotationAsConfigured.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetFromConfiguration.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyXml.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/PublishedPropertyFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/PublishedPropertyFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderunchanged/UnchangingFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderunchanged/UnchangingFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/NotPersistableFacetInferred.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaClearMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/init/PropertyInitializationFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/init/PropertyInitializationFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/init/PropertyInitializationFacetViaSetterMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefaultFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethod.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/TimeFormatter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/TimeParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/TimeFormatter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/TimeParser.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleFloatingPointValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoublePrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoublePrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatingPointValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntegerValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortPrimitiveValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortPrimitiveValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortWrapperValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortWrapperValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/treenode/TreeNodeValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/treenode/TreeNodeValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueFacetUsingSemanticsProviderFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInteractionContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/DeweyOrderSet.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/OrderSetGroupNameComparator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/load/ObjectLoader.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/refresh/ObjectRefresher.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ObjectSpecificationPostProcessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelService.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/CollectionHelper.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorLegacy.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/command/CommandDtoServiceInternal.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/devutils/MemberType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventSupport_Spring.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
 rename core/metamodel/src/main/java/org/apache/isis/{ => core}/metamodel/services/grid/bootstrap3/DefaultGrid.layout.xml (100%)
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/HomePageAction.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/HomePageResolverService.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/package-info.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ixn/InteractionDtoServiceInternal.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceNoop.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainModelDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExportSupport.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/Util.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/PublisherDispatchService.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/SpringContextProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/EntityState.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InjectorMethodEvaluator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiationException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecId.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/Contributed.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/CurrentHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyActionParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyFeature.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneActionParameter.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneFeature.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/CollectionUtils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault_debug.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ProxyEnhanced.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/postprocessor/PostProcessor.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Factories.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributeeAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterMixedInAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Predicates.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Utils.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/DescribedAsFacetOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/NamedFacetOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/PluralFacetOnStandaloneList.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelInvalidException.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAnnotation.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedMethodPrefix.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForValidationFailures.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/DeweyOrderComparator.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/EventUtil.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChainDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/Helper.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/IsisSchema.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/Place.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSchema.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XsMetaModel.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeDefinition.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProvider.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForCollections.java
 create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapterProvider.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectNotFoundException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Value.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/PojoRecreationException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/PojoRefreshException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/package-info.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/package-info.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/CanBeVoid.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassFunctions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassPredicates.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/CloseableExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/DateExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/InputStreamExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MapUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ToString.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/Wormhole.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/commons/package-info.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Allow.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Consent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/ConsentAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionContextType.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionInitiatedBy.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionResult.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionResultSet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContextAware.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectNotFoundException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/PojoRecreationException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/PojoRefreshException.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/Facet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetWithAttributes.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FeatureType.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/IdentifiedHolder.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/MetaModelRefiner.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/MethodRemover.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactoryAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethodParameter.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacetMulti.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFilteringFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodLiteralConstants.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodRemoverConstants.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MultipleValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ObjectSpecIdFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PostConstructMethodCache.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleClassValueFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleIntValueFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleStringValueFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/SingleValueFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/TypedHolder.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/TypedHolderDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/WhereValueFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/WhereValueFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/ElementSpecificationProviderFromTypeOfFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/associateWith/AssociatedWithFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/associateWith/AssociatedWithFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/associateWith/AssociatedWithFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotationAsConfigured.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/command/CommandFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/command/CommandFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageFacetImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/HiddenFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/position/ActionPositionFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/position/ActionPositionFacetFallback.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/publish/PublishedActionFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/publish/PublishedActionFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/redirect/RedirectFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/redirect/RedirectFacetFallback.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/semantics/ActionSemanticsFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionParameterValidationFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/describedas/DescribedAsFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/describedas/DescribedAsFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/help/HelpFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/help/HelpFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/hide/HiddenFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/DescribedAsFacetTranslated.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/NamedFacetTranslated.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/PluralFacetTranslated.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/named/NamedFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/named/NamedFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/named/NamedFacetInferred.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetViaAccessor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetViaClearMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/defaultview/DefaultViewFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/defaultview/DefaultViewFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/disabled/DisabledFacetForCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/notpersisted/NotPersistedFacetForCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/typeof/TypeOfFacetOnCollectionFromCollectionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutable.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/disabled/fromimmutable/DisabledFacetOnCollectionDerivedFromImmutableFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/TypeOfFacetInferredFromSupportingMethods.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/parented/ParentedCollectionFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/SortedByFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/SortedByFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collparam/semantics/CollectionSemantics.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collparam/semantics/CollectionSemanticsFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collparam/semantics/CollectionSemanticsFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionChoicesFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/DescribedAsFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/PagedFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlAccessorTypeFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlAccessorTypeFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlAccessorTypeFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlJavaTypeAdapterFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlTransientFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlTransientFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/XmlTransientFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/CssClassFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/CssClassFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/CssClassFacetAbstract2.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegex.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaPosition.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromProperties.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberDerivedFromType.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFromProperties.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractAlwaysEverywhere.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetForContributee.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/annotprop/MemberOrderFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/annotprop/MemberOrderFacetForActionAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/annotprop/MemberOrderFacetProperties.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/annotprop/MemberOrderFacetXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/audit/AuditableFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/audit/AuditableFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/audit/AuditableFacetImpl.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/autocomplete/AutoCompleteFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/ChoicesFacetUtils.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/QueryFindAllChoices.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/ChoicesFacetEnum.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/DisabledObjectFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/domainevents/ActionDomainEventDefaultFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/domainevents/CollectionDomainEventDefaultFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/DomainServiceFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/entity/EntityFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/annotation/FacetsFacetAnnotation.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/annotation/FacetsFacetAnnotationFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetDefault.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/HiddenObjectFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/IconFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/IconFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/IteratorFilteringFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetAbstract.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFallback.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetMethod.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacet.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetAbstract.java
... 2933 lines suppressed ...


[isis] 04/21: ISIS-2259: introduce parent for viewers/restfulobjects

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

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

commit 8b21f46ff429773a2c760e8248c0ba76d4e34fff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:07:01 2020 +0000

    ISIS-2259: introduce parent for viewers/restfulobjects
---
 core/pom.xml                                       |  1 +
 core/viewers/restfulobjects/applib/pom.xml         |  4 +--
 .../restfulobjects/jaxrs-resteasy-4/pom.xml        |  3 +-
 .../viewers/restfulobjects/{rendering => }/pom.xml | 40 ++++++----------------
 core/viewers/restfulobjects/rendering/pom.xml      |  3 +-
 core/viewers/restfulobjects/viewer/pom.xml         |  3 +-
 6 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 32d5f90..87a8d30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1862,6 +1862,7 @@
 		<module>security/shiro</module>
 		<module>security/keycloak</module>
 
+		<module>viewers/restfulobjects</module>
 		<module>viewers/restfulobjects/applib</module>
 		<module>viewers/restfulobjects/rendering</module>
 		<module>viewers/restfulobjects/jaxrs-resteasy-4</module>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index 6380215..137d1f2 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -22,9 +22,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-restfulobjects</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
 	<artifactId>isis-viewer-restfulobjects-applib</artifactId>
@@ -37,7 +36,6 @@
 
     <dependencies>
 
-		
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-applib</artifactId>
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 0c15ed2..4bedb31 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -16,9 +16,8 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-viewer-restfulobjects</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-viewer-restfulobjects-jaxrsresteasy4</artifactId>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/pom.xml
similarity index 53%
copy from core/viewers/restfulobjects/rendering/pom.xml
copy to core/viewers/restfulobjects/pom.xml
index afa91a2..753d28f 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/pom.xml
@@ -18,43 +18,25 @@
   under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-viewer-restfulobjects-rendering</artifactId>
+	<artifactId>isis-viewer-restfulobjects</artifactId>
+	<name>Apache Isis Viewer - RO</name>
 
-	<name>Apache Isis Viewer - RO (Rendering)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.rendering</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/viewer/restfulobjects/rendering</git-plugin.propertiesDir>
-    </properties>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-viewer-restfulobjects-applib</artifactId>
-        </dependency>
-        
-        <!-- TEST DEPENDENCIES -->
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-	</dependencies>
+    <packaging>pom</packaging>
 
+    <modules>
+        <module>applib</module>
+        <module>rendering</module>
+        <module>viewer</module>
+        <module>jaxrs-resteasy-4</module>
+    </modules>
 
 </project>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/rendering/pom.xml
index afa91a2..c803a7a 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/rendering/pom.xml
@@ -22,9 +22,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-restfulobjects</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-viewer-restfulobjects-rendering</artifactId>
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/core/viewers/restfulobjects/viewer/pom.xml
index dafbb1d..13a2bcf 100644
--- a/core/viewers/restfulobjects/viewer/pom.xml
+++ b/core/viewers/restfulobjects/viewer/pom.xml
@@ -22,9 +22,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-restfulobjects</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-viewer-restfulobjects-viewer</artifactId>


[isis] 02/21: ISIS-2259: revert, renames isis-core-schema back to isis-schema

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

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

commit bfd3bf47b00ccef4245bd2fb615d1a40cca866f0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:59:35 2020 +0000

    ISIS-2259: revert, renames isis-core-schema back to isis-schema
---
 core/applib/pom.xml      | 2 +-
 core/pom.xml             | 4 ++--
 core/schema/pom.xml      | 2 +-
 mavendeps/webapp/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 4964ca3..6072156 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-schema</artifactId>
+            <artifactId>isis-schema</artifactId>
         </dependency>
 
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index ad9c4b7..d5896f5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -734,14 +734,14 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-schema</artifactId>
+				<artifactId>isis-schema</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>jar</type>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-schema</artifactId>
+				<artifactId>isis-schema</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>test-jar</type>
 				<scope>test</scope>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 5d03ca0..db4083e 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -20,7 +20,7 @@
 		<version>2.0.0-M3-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>isis-core-schema</artifactId>
+	<artifactId>isis-schema</artifactId>
 
 	<packaging>jar</packaging>
 	<name>Apache Isis Core - Schemas</name>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 9af814b..5c316ce 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -72,7 +72,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-schema</artifactId>
+			<artifactId>isis-schema</artifactId>
 			<!--
             excluded to make consistent with JDK11 where these have been removed from the JDK and must be explicitly included.
             -->


[isis] 20/21: ISIS-2259: fixes up package name of isis-core-metamodel

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

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

commit 31b8b21f2e297439edf889faacfd685122a8751a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:10:11 2020 +0000

    ISIS-2259: fixes up package name of isis-core-metamodel
---
 .../core/config/presets/DebugMetaModel.properties  |    2 +-
 .../presets/DebugProgrammingModel.properties       |    4 +-
 .../config/presets/SilenceMetaModel.properties     |    2 +-
 .../presets/SilenceProgrammingModel.properties     |    4 +-
 .../commons/internal/reflection/ReflectTest.java   |   10 +-
 .../facets/object/mixin/MixinIntendedAs.java       |   26 +-
 .../object/mixin/MixinIntendedAsActionTest.java    |    1 -
 .../facets/param/name/ParameterNameFacetTest.java  |   14 +-
 core/metamodel/log4j2-test.xml                     |    2 +-
 .../isis/core/metamodel/IsisModuleMetamodel.java   |  101 ++
 .../isis/core/metamodel/adapter/ObjectAdapter.java |   61 ++
 .../metamodel/adapter/ObjectAdapterProvider.java   |   35 +
 .../adapter/oid/ObjectNotFoundException.java       |   36 +
 .../adapter/oid/ObjectPersistenceException.java    |   42 +
 .../isis/core/metamodel/adapter/oid/Oid.java       |  140 +++
 .../core/metamodel/adapter/oid/Oid_Marshaller.java |  254 +++++
 .../core/metamodel/adapter/oid/Oid_Parented.java   |  146 +++
 .../isis/core/metamodel/adapter/oid/Oid_Root.java  |  167 +++
 .../isis/core/metamodel/adapter/oid/Oid_Value.java |   87 ++
 .../core/metamodel/adapter/oid/ParentedOid.java    |   54 +
 .../adapter/oid/PojoRecreationException.java       |   29 +
 .../adapter/oid/PojoRefreshException.java          |   32 +
 .../isis/core/metamodel/adapter/oid/RootOid.java   |   46 +
 .../isis/core/metamodel/adapter/package-info.java  |   32 +
 .../authorization/standard/AuthorizationFacet.java |   32 +
 .../standard/AuthorizationFacetAbstract.java       |   78 ++
 .../standard/AuthorizationFacetFactory.java        |   46 +
 .../standard/AuthorizationFacetImpl.java           |   30 +
 .../authorization/standard/package-info.java       |   33 +
 .../core/metamodel/commons/ArrayExtensions.java    |   69 ++
 .../isis/core/metamodel/commons/CanBeVoid.java     |   25 +
 .../core/metamodel/commons/ClassExtensions.java    |  175 +++
 .../core/metamodel/commons/ClassFunctions.java     |   46 +
 .../core/metamodel/commons/ClassPredicates.java    |   37 +
 .../isis/core/metamodel/commons/ClassUtil.java     |  192 ++++
 .../metamodel/commons/CloseableExtensions.java     |   40 +
 .../core/metamodel/commons/DateExtensions.java     |   35 +
 .../metamodel/commons/InputStreamExtensions.java   |   69 ++
 .../core/metamodel/commons/ListExtensions.java     |  115 ++
 .../isis/core/metamodel/commons/LocaleUtil.java    |   40 +
 .../isis/core/metamodel/commons/MapUtil.java       |   48 +
 .../core/metamodel/commons/MethodExtensions.java   |   92 ++
 .../commons/MethodInvocationPreprocessor.java      |  154 +++
 .../isis/core/metamodel/commons/MethodUtil.java    |  202 ++++
 .../core/metamodel/commons/ObjectExtensions.java   |   82 ++
 .../isis/core/metamodel/commons/ResourceUtil.java  |   83 ++
 .../core/metamodel/commons/StringExtensions.java   |  393 +++++++
 .../metamodel/commons/ThrowableExtensions.java     |   82 ++
 .../isis/core/metamodel/commons/ToString.java      |  165 +++
 .../isis/core/metamodel/commons/Wormhole.java      |   50 +
 .../isis/core/metamodel/commons/package-info.java  |   27 +
 .../apache/isis/core/metamodel/consent/Allow.java  |   56 +
 .../isis/core/metamodel/consent/Consent.java       |   73 ++
 .../core/metamodel/consent/ConsentAbstract.java    |  159 +++
 .../core/metamodel/consent/InteractionAdvisor.java |  103 ++
 .../metamodel/consent/InteractionContextType.java  |  135 +++
 .../metamodel/consent/InteractionInitiatedBy.java  |   33 +
 .../core/metamodel/consent/InteractionResult.java  |  155 +++
 .../metamodel/consent/InteractionResultSet.java    |  104 ++
 .../apache/isis/core/metamodel/consent/Veto.java   |   48 +
 .../core/metamodel/context/MetaModelContext.java   |  212 ++++
 .../metamodel/context/MetaModelContextAware.java   |   29 +
 .../context/MetaModelContext_usingIoc.java         |  172 +++
 .../core/metamodel/context/MetaModelContexts.java  |   44 +
 .../metamodel/exceptions/MetaModelException.java   |   43 +
 .../persistence/ObjectNotFoundException.java       |   38 +
 .../persistence/ObjectPersistenceException.java    |   42 +
 .../persistence/PojoRecreationException.java       |   31 +
 .../persistence/PojoRefreshException.java          |   34 +
 .../apache/isis/core/metamodel/facetapi/Facet.java |  123 +++
 .../core/metamodel/facetapi/FacetAbstract.java     |  287 +++++
 .../isis/core/metamodel/facetapi/FacetHolder.java  |  150 +++
 .../core/metamodel/facetapi/FacetHolderImpl.java   |  168 +++
 .../isis/core/metamodel/facetapi/FacetUtil.java    |   96 ++
 .../metamodel/facetapi/FacetWithAttributes.java    |   32 +
 .../isis/core/metamodel/facetapi/FeatureType.java  |  159 +++
 .../core/metamodel/facetapi/IdentifiedHolder.java  |   31 +
 .../core/metamodel/facetapi/MetaModelRefiner.java  |   34 +
 .../core/metamodel/facetapi/MethodRemover.java     |   71 ++
 .../isis/core/metamodel/facets/Annotations.java    |  695 ++++++++++++
 .../core/metamodel/facets/CollectionUtils.java     |  129 +++
 .../facets/ContributeeMemberFacetFactory.java      |   45 +
 .../core/metamodel/facets/DependentArgUtils.java   |  198 ++++
 .../core/metamodel/facets/DomainEventHelper.java   |  441 ++++++++
 .../isis/core/metamodel/facets/FacetFactory.java   |  337 ++++++
 .../metamodel/facets/FacetFactoryAbstract.java     |   70 ++
 .../isis/core/metamodel/facets/FacetedMethod.java  |  216 ++++
 .../metamodel/facets/FacetedMethodParameter.java   |   50 +
 .../core/metamodel/facets/ImperativeFacet.java     |  169 +++
 .../metamodel/facets/ImperativeFacetMulti.java     |   33 +
 .../facets/MethodFilteringFacetFactory.java        |   33 +
 .../core/metamodel/facets/MethodFinderUtils.java   |  239 +++++
 .../metamodel/facets/MethodLiteralConstants.java   |   77 ++
 .../facets/MethodPrefixBasedFacetFactory.java      |   39 +
 .../MethodPrefixBasedFacetFactoryAbstract.java     |  138 +++
 .../metamodel/facets/MethodRemoverConstants.java   |   44 +
 .../core/metamodel/facets/MultipleValueFacet.java  |   26 +
 .../metamodel/facets/ObjectSpecIdFacetFactory.java |   37 +
 .../facets/OrphanedSupportingMethodValidator.java  |  126 +++
 .../metamodel/facets/PostConstructMethodCache.java |   30 +
 ...ropertyOrCollectionIdentifyingFacetFactory.java |   83 ++
 ...rCollectionIdentifyingFacetFactoryAbstract.java |   43 +
 .../metamodel/facets/SingleClassValueFacet.java    |   35 +
 .../facets/SingleClassValueFacetAbstract.java      |   60 ++
 .../core/metamodel/facets/SingleIntValueFacet.java |   27 +
 .../facets/SingleIntValueFacetAbstract.java        |   47 +
 .../metamodel/facets/SingleStringValueFacet.java   |   23 +
 .../facets/SingleStringValueFacetAbstract.java     |   58 +
 .../core/metamodel/facets/SingleValueFacet.java    |   28 +
 .../metamodel/facets/SingleValueFacetAbstract.java |   46 +
 .../isis/core/metamodel/facets/TypedHolder.java    |   55 +
 .../core/metamodel/facets/TypedHolderDefault.java  |   58 +
 .../core/metamodel/facets/WhereValueFacet.java     |   29 +
 .../metamodel/facets/WhereValueFacetAbstract.java  |   57 +
 ...lementSpecificationProviderFromTypeOfFacet.java |   37 +
 .../facets/actcoll/typeof/TypeOfFacet.java         |  126 +++
 .../facets/actcoll/typeof/TypeOfFacetAbstract.java |   40 +
 .../actcoll/typeof/TypeOfFacetDefaultToObject.java |   30 +
 .../typeof/TypeOfFacetInferredFromArray.java       |   30 +
 .../typeof/TypeOfFacetInferredFromGenerics.java    |   30 +
 .../action/ActionAnnotationFacetFactory.java       |  287 +++++
 ...nChoicesForCollectionParameterFacetFactory.java |  161 +++
 .../action/associateWith/AssociatedWithFacet.java  |   30 +
 .../associateWith/AssociatedWithFacetAbstract.java |   45 +
 .../AssociatedWithFacetForActionAnnotation.java    |   32 +
 .../command/CommandFacetForActionAnnotation.java   |  123 +++
 ...ommandFacetForActionAnnotationAsConfigured.java |   39 +
 .../command/CommandFacetFromConfiguration.java     |   46 +
 .../hidden/HiddenFacetForActionAnnotation.java     |   56 +
 .../action/invocation/ActionDomainEventFacet.java  |   33 +
 .../invocation/ActionDomainEventFacetAbstract.java |  165 +++
 .../invocation/ActionDomainEventFacetDefault.java  |   33 +
 .../ActionDomainEventFacetForActionAnnotation.java |   32 +
 .../action/invocation/ActionInvocationFacet.java   |   51 +
 .../invocation/ActionInvocationFacetAbstract.java  |   38 +
 ...ctionInvocationFacetForDomainEventAbstract.java |  513 +++++++++
 ...ionFacetForDomainEventFromActionAnnotation.java |   40 +
 ...onInvocationFacetForDomainEventFromDefault.java |   40 +
 .../actions/action/invocation/CommandUtil.java     |  113 ++
 .../PrototypeFacetForActionAnnotation.java         |   51 +
 .../PublishedActionFacetForActionAnnotation.java   |   99 ++
 ...ActionFacetForActionAnnotationAsConfigured.java |   31 +
 .../PublishedActionFacetFromConfiguration.java     |   32 +
 ...ctionSemanticsFacetFallbackToNonIdempotent.java |   32 +
 .../ActionSemanticsFacetForActionAnnotation.java   |   49 +
 .../typeof/TypeOfFacetForActionAnnotation.java     |   33 +
 .../facets/actions/command/CommandFacet.java       |   55 +
 .../actions/command/CommandFacetAbstract.java      |  123 +++
 .../actions/defaults/ActionDefaultsFacet.java      |   35 +
 .../defaults/ActionDefaultsFacetAbstract.java      |   36 +
 .../method/ActionDefaultsFacetViaMethod.java       |   88 ++
 .../ActionDefaultsFacetViaMethodFactory.java       |   88 ++
 .../FileAcceptFacetForActionAnnotation.java        |   47 +
 .../facets/actions/homepage/HomePageFacet.java     |   34 +
 .../actions/homepage/HomePageFacetAbstract.java    |   36 +
 .../facets/actions/homepage/HomePageFacetImpl.java |   30 +
 .../annotation/HomePageFacetAnnotation.java        |   31 +
 .../annotation/HomePageFacetAnnotationFactory.java |  130 +++
 .../actions/layout/ActionLayoutFacetFactory.java   |  171 +++
 ...tionPositionFacetForActionLayoutAnnotation.java |   46 +
 .../layout/ActionPositionFacetForActionXml.java    |   41 +
 ...okmarkPolicyFacetForActionLayoutAnnotation.java |   58 +
 .../layout/BookmarkPolicyFacetForActionXml.java    |   42 +
 .../CssClassFaFacetForActionLayoutAnnotation.java  |   57 +
 .../layout/CssClassFaFacetForActionXml.java        |   44 +
 .../CssClassFacetForActionLayoutAnnotation.java    |   47 +
 .../actions/layout/CssClassFacetForActionXml.java  |   42 +
 .../DescribedAsFacetForActionLayoutAnnotation.java |   47 +
 .../layout/DescribedAsFacetForActionXml.java       |   42 +
 .../HiddenFacetForActionLayoutAnnotation.java      |   56 +
 .../actions/layout/HiddenFacetForActionXml.java    |   51 +
 .../NamedFacetForActionLayoutAnnotation.java       |   48 +
 .../actions/layout/NamedFacetForActionXml.java     |   44 +
 ...tContributedFacetForActionLayoutAnnotation.java |   52 +
 .../PromptStyleFacetForActionLayoutAnnotation.java |   97 ++
 .../layout/PromptStyleFacetForActionXml.java       |   57 +
 .../RedirectFacetFromActionLayoutAnnotation.java   |   47 +
 .../actions/layout/RedirectFacetFromActionXml.java |   43 +
 .../notcontributed/NotContributedFacet.java        |   40 +
 .../NotContributedFacetAbstract.java               |   73 ++
 ...tributedFacetDerivedFromDomainServiceFacet.java |   47 +
 ...dFacetDerivedFromDomainServiceFacetFactory.java |   58 +
 .../NotContributedFacetDerivedFromMixinFacet.java  |   37 +
 ...ntributedFacetDerivedFromMixinFacetFactory.java |   52 +
 .../notinservicemenu/NotInServiceMenuFacet.java    |   38 +
 .../NotInServiceMenuFacetAbstract.java             |   40 +
 ...viceMenuFacetDerivedFromDomainServiceFacet.java |   54 +
 ...uFacetDerivedFromDomainServiceFacetFactory.java |   59 ++
 .../actions/position/ActionPositionFacet.java      |   44 +
 .../position/ActionPositionFacetAbstract.java      |   57 +
 .../position/ActionPositionFacetFallback.java      |   31 +
 .../facets/actions/prototype/PrototypeFacet.java   |   30 +
 .../actions/prototype/PrototypeFacetAbstract.java  |   56 +
 .../actions/publish/PublishedActionFacet.java      |   30 +
 .../publish/PublishedActionFacetAbstract.java      |   38 +
 .../facets/actions/redirect/RedirectFacet.java     |   33 +
 .../actions/redirect/RedirectFacetAbstract.java    |   66 ++
 .../actions/redirect/RedirectFacetFallback.java    |   31 +
 .../actions/semantics/ActionSemanticsFacet.java    |   33 +
 .../semantics/ActionSemanticsFacetAbstract.java    |   39 +
 .../validate/ActionParameterValidationFacet.java   |   46 +
 .../ActionParameterValidationFacetAbstract.java    |   47 +
 .../actions/validate/ActionValidationFacet.java    |   49 +
 .../validate/ActionValidationFacetAbstract.java    |   47 +
 .../ActionParameterValidationFacetViaMethod.java   |   84 ++
 .../method/ActionValidationFacetViaMethod.java     |   84 ++
 .../ActionValidationFacetViaMethodFactory.java     |  117 ++
 .../facets/all/deficiencies/DeficiencyFacet.java   |  134 +++
 .../facets/all/describedas/DescribedAsFacet.java   |   33 +
 .../all/describedas/DescribedAsFacetAbstract.java  |   36 +
 .../core/metamodel/facets/all/help/HelpFacet.java  |   29 +
 .../facets/all/help/HelpFacetAbstract.java         |   36 +
 .../metamodel/facets/all/hide/HiddenFacet.java     |   31 +
 .../all/i18n/DescribedAsFacetTranslated.java       |   64 ++
 .../facets/all/i18n/NamedFacetTranslated.java      |   72 ++
 .../facets/all/i18n/PluralFacetTranslated.java     |   55 +
 .../facets/all/i18n/TranslationFacetFactory.java   |  119 +++
 .../metamodel/facets/all/named/NamedFacet.java     |   42 +
 .../facets/all/named/NamedFacetAbstract.java       |   59 ++
 .../facets/all/named/NamedFacetInferred.java       |   31 +
 .../collections/CollectionFacetAbstract.java       |   40 +
 .../CollectionAccessorFacetViaAccessor.java        |  109 ++
 .../CollectionAccessorFacetViaAccessorFactory.java |  112 ++
 .../clear/CollectionClearFacetFactory.java         |   70 ++
 .../clear/CollectionClearFacetViaAccessor.java     |   79 ++
 .../clear/CollectionClearFacetViaClearMethod.java  |   70 ++
 .../CollectionAnnotationFacetFactory.java          |  293 +++++
 .../collection/defaultview/DefaultViewFacet.java   |   26 +
 .../defaultview/DefaultViewFacetAbstract.java      |   35 +
 .../DisabledFacetForCollectionAnnotation.java      |   69 ++
 .../hidden/HiddenFacetForCollectionAnnotation.java |   56 +
 ...ectionAddToFacetForDomainEventFromAbstract.java |  124 +++
 ...acetForDomainEventFromCollectionAnnotation.java |   43 +
 ...lectionAddToFacetForDomainEventFromDefault.java |   41 +
 .../modify/CollectionDomainEventFacet.java         |   34 +
 .../modify/CollectionDomainEventFacetAbstract.java |  145 +++
 .../modify/CollectionDomainEventFacetDefault.java  |   32 +
 ...ionDomainEventFacetForCollectionAnnotation.java |   45 +
 ...nRemoveFromFacetForDomainEventFromAbstract.java |  123 +++
 ...acetForDomainEventFromCollectionAnnotation.java |   43 +
 ...onRemoveFromFacetForDomainEventFromDefault.java |   41 +
 .../NotPersistedFacetForCollectionAnnotation.java  |   55 +
 ...fFacetOnCollectionFromCollectionAnnotation.java |   47 +
 ...abledFacetOnCollectionDerivedFromImmutable.java |   39 +
 ...cetOnCollectionDerivedFromImmutableFactory.java |   45 +
 .../javautilcollection/CollectionFacetFactory.java |   86 ++
 .../javautilcollection/JavaArrayFacet.java         |   84 ++
 .../javautilcollection/JavaCollectionFacet.java    |   78 ++
 .../layout/CollectionLayoutFacetFactory.java       |  123 +++
 ...CssClassFacetForCollectionLayoutAnnotation.java |   45 +
 .../layout/CssClassFacetForCollectionXml.java      |   42 +
 ...aultViewFacetForCollectionLayoutAnnotation.java |   48 +
 .../layout/DefaultViewFacetForCollectionXml.java   |   42 +
 ...cribedAsFacetForCollectionLayoutAnnotation.java |   45 +
 .../layout/DescribedAsFacetForCollectionXml.java   |   42 +
 .../HiddenFacetForCollectionLayoutAnnotation.java  |   58 +
 .../layout/HiddenFacetForCollectionXml.java        |   51 +
 .../NamedFacetForCollectionLayoutAnnotation.java   |   52 +
 .../layout/NamedFacetForCollectionXml.java         |   47 +
 .../PagedFacetForCollectionLayoutAnnotation.java   |   46 +
 .../layout/PagedFacetForCollectionXml.java         |   41 +
 ...SortedByFacetForCollectionLayoutAnnotation.java |   53 +
 .../layout/SortedByFacetForCollectionXml.java      |   56 +
 .../collections/modify/CollectionAddToFacet.java   |   37 +
 .../modify/CollectionAddToFacetAbstract.java       |   36 +
 .../modify/CollectionAddToFacetViaAccessor.java    |   77 ++
 .../modify/CollectionAddToFacetViaMethod.java      |   74 ++
 ...tionAddToRemoveFromAndValidateFacetFactory.java |  177 ++++
 .../collections/modify/CollectionClearFacet.java   |   36 +
 .../modify/CollectionClearFacetAbstract.java       |   36 +
 .../facets/collections/modify/CollectionFacet.java |  112 ++
 .../modify/CollectionRemoveFromFacet.java          |   39 +
 .../modify/CollectionRemoveFromFacetAbstract.java  |   36 +
 .../CollectionRemoveFromFacetViaAccessor.java      |   80 ++
 .../modify/CollectionRemoveFromFacetViaMethod.java |   74 ++
 .../TypeOfFacetInferredFromSupportingMethods.java  |   31 +
 .../parented/ParentedCollectionFacetDefault.java   |   37 +
 .../ParentedFacetSinceCollectionFactory.java       |   53 +
 .../facets/collections/sortedby/SortedByFacet.java |   32 +
 .../sortedby/SortedByFacetAbstract.java            |   38 +
 .../annotation/SortedByFacetAnnotationFactory.java |   90 ++
 .../validate/CollectionValidateAddToFacet.java     |   40 +
 .../CollectionValidateAddToFacetAbstract.java      |   48 +
 .../CollectionValidateAddToFacetViaMethod.java     |   82 ++
 .../CollectionValidateRemoveFromFacet.java         |   39 +
 .../CollectionValidateRemoveFromFacetAbstract.java |   47 +
 ...CollectionValidateRemoveFromFacetViaMethod.java |   83 ++
 .../collparam/semantics/CollectionSemantics.java   |  125 +++
 .../semantics/CollectionSemanticsFacet.java        |   29 +
 .../semantics/CollectionSemanticsFacetDefault.java |   47 +
 .../facets/fallback/ActionChoicesFacetNone.java    |   45 +
 .../facets/fallback/ActionDefaultsFacetNone.java   |   42 +
 .../facets/fallback/DescribedAsFacetNone.java      |   39 +
 .../facets/fallback/FallbackFacetFactory.java      |  144 +++
 .../metamodel/facets/fallback/HelpFacetNone.java   |   44 +
 .../LabelAtFacetFromLayoutConfiguration.java       |   30 +
 .../facets/fallback/MaxLengthFacetUnlimited.java   |   46 +
 .../facets/fallback/MultiLineFacetNone.java        |   36 +
 .../facets/fallback/NamedFacetDefault.java         |   33 +
 .../metamodel/facets/fallback/NamedFacetNone.java  |   44 +
 .../fallback/PagedFacetFromConfiguration.java      |   29 +
 .../metamodel/facets/fallback/TitleFacetNone.java  |   42 +
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  399 +++++++
 .../facets/jaxb/XmlAccessorTypeFacet.java          |   31 +
 .../facets/jaxb/XmlAccessorTypeFacetAbstract.java  |   40 +
 .../facets/jaxb/XmlAccessorTypeFacetDefault.java   |   33 +
 .../facets/jaxb/XmlJavaTypeAdapterFacet.java       |   29 +
 .../jaxb/XmlJavaTypeAdapterFacetAbstract.java      |   38 +
 .../jaxb/XmlJavaTypeAdapterFacetDefault.java       |   31 +
 .../metamodel/facets/jaxb/XmlTransientFacet.java   |   29 +
 .../facets/jaxb/XmlTransientFacetAbstract.java     |   37 +
 .../facets/jaxb/XmlTransientFacetDefault.java      |   30 +
 .../facets/members/cssclass/CssClassFacet.java     |   38 +
 .../members/cssclass/CssClassFacetAbstract.java    |   51 +
 .../members/cssclass/CssClassFacetAbstract2.java   |   36 +
 .../CssClassFacetOnActionFromConfiguredRegex.java  |   30 +
 ...assFacetOnActionFromConfiguredRegexFactory.java |  120 +++
 .../facets/members/cssclassfa/CssClassFaFacet.java |   37 +
 .../cssclassfa/CssClassFaFacetAbstract.java        |   79 ++
 .../members/cssclassfa/CssClassFaPosition.java     |  104 ++
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |  103 ++
 ...CssClassFaFacetOnMemberFromConfiguredRegex.java |   31 +
 .../CssClassFaFacetOnMemberFromProperties.java     |   40 +
 .../cssclassfa/annotprop/MixinInterceptor.java     |   64 ++
 .../DescribedAsFacetOnMemberDerivedFromType.java   |   32 +
 .../annotprop/DescribedAsFacetOnMemberFactory.java |   64 ++
 .../DescribedAsFacetOnMemberFromProperties.java    |   37 +
 .../facets/members/disabled/DisabledFacet.java     |   54 +
 .../members/disabled/DisabledFacetAbstract.java    |  102 ++
 .../DisabledFacetAbstractAlwaysEverywhere.java     |   40 +
 .../disabled/DisabledFacetAbstractImpl.java        |   83 ++
 .../disabled/DisabledFacetForContributee.java      |   30 +
 .../disabled/method/DisableForContextFacet.java    |   37 +
 .../method/DisableForContextFacetAbstract.java     |   37 +
 .../method/DisableForContextFacetNone.java         |   49 +
 .../method/DisableForContextFacetViaMethod.java    |  100 ++
 .../DisableForContextFacetViaMethodFactory.java    |   94 ++
 .../facets/members/hidden/HiddenFacetAbstract.java |   86 ++
 .../HiddenFacetAbstractAlwaysEverywhere.java       |   50 +
 .../members/hidden/HiddenFacetAbstractImpl.java    |   52 +
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   53 +
 .../members/hidden/method/HideForContextFacet.java |   37 +
 .../hidden/method/HideForContextFacetAbstract.java |   37 +
 .../hidden/method/HideForContextFacetNone.java     |   45 +
 .../method/HideForContextFacetViaMethod.java       |   78 ++
 .../HideForContextFacetViaMethodFactory.java       |   82 ++
 .../facets/members/order/MemberOrderFacet.java     |   59 ++
 .../members/order/MemberOrderFacetAbstract.java    |  107 ++
 .../annotprop/MemberOrderFacetAnnotation.java      |   35 +
 .../order/annotprop/MemberOrderFacetFactory.java   |   69 ++
 .../MemberOrderFacetForActionAnnotation.java       |   34 +
 .../annotprop/MemberOrderFacetProperties.java      |   49 +
 .../order/annotprop/MemberOrderFacetXml.java       |   35 +
 .../ViewModelSemanticCheckingFacetFactory.java     |  209 ++++
 .../facets/object/audit/AuditableFacet.java        |   40 +
 .../object/audit/AuditableFacetAbstract.java       |   61 ++
 .../facets/object/audit/AuditableFacetImpl.java    |   30 +
 .../object/autocomplete/AutoCompleteFacet.java     |   35 +
 .../autocomplete/AutoCompleteFacetAbstract.java    |  126 +++
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |   31 +
 .../BookmarkPolicyFacetAbstract.java               |   59 ++
 .../BookmarkPolicyFacetFallback.java               |   32 +
 .../BookmarkPolicyFacetFallbackFactory.java        |   88 ++
 .../facets/object/callbacks/CallbackFacet.java     |   53 +
 .../object/callbacks/CallbackFacetAbstract.java    |   35 +
 .../object/callbacks/CreatedCallbackFacet.java     |   36 +
 .../callbacks/CreatedCallbackFacetAbstract.java    |   35 +
 .../callbacks/CreatedCallbackFacetFactory.java     |   51 +
 .../callbacks/CreatedCallbackFacetViaMethod.java   |   70 ++
 .../callbacks/CreatedLifecycleEventFacet.java      |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   46 +
 .../object/callbacks/LifecycleEventFacet.java      |   28 +
 .../object/callbacks/LoadCallbackFacetFactory.java |   63 ++
 .../object/callbacks/LoadedCallbackFacet.java      |   37 +
 .../callbacks/LoadedCallbackFacetAbstract.java     |   35 +
 .../callbacks/LoadedCallbackFacetViaMethod.java    |   71 ++
 .../callbacks/LoadedLifecycleEventFacet.java       |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 +
 .../object/callbacks/LoadingCallbackFacet.java     |   28 +
 .../callbacks/LoadingCallbackFacetAbstract.java    |   39 +
 .../callbacks/LoadingCallbackFacetViaMethod.java   |   75 ++
 .../callbacks/PersistCallbackFacetFactory.java     |   78 ++
 .../PersistCallbackViaSaveMethodFacetFactory.java  |   78 ++
 .../object/callbacks/PersistedCallbackFacet.java   |   36 +
 .../callbacks/PersistedCallbackFacetAbstract.java  |   35 +
 .../callbacks/PersistedCallbackFacetViaMethod.java |   71 ++
 .../callbacks/PersistedLifecycleEventFacet.java    |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 +
 .../object/callbacks/PersistingCallbackFacet.java  |   37 +
 .../callbacks/PersistingCallbackFacetAbstract.java |   35 +
 .../PersistingCallbackFacetViaMethod.java          |   71 ++
 .../callbacks/PersistingLifecycleEventFacet.java   |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../callbacks/RemoveCallbackFacetFactory.java      |   79 ++
 .../RemoveCallbackViaDeleteMethodFacetFactory.java |   79 ++
 .../object/callbacks/RemovedCallbackFacet.java     |   35 +
 .../callbacks/RemovedCallbackFacetAbstract.java    |   39 +
 .../callbacks/RemovedCallbackFacetViaMethod.java   |   75 ++
 .../object/callbacks/RemovingCallbackFacet.java    |   34 +
 .../callbacks/RemovingCallbackFacetAbstract.java   |   35 +
 .../callbacks/RemovingCallbackFacetViaMethod.java  |   71 ++
 .../callbacks/RemovingLifecycleEventFacet.java     |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../callbacks/UpdateCallbackFacetFactory.java      |   68 ++
 .../object/callbacks/UpdatedCallbackFacet.java     |   37 +
 .../callbacks/UpdatedCallbackFacetAbstract.java    |   35 +
 .../callbacks/UpdatedCallbackFacetViaMethod.java   |   71 ++
 .../callbacks/UpdatedLifecycleEventFacet.java      |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../object/callbacks/UpdatingCallbackFacet.java    |   37 +
 .../callbacks/UpdatingCallbackFacetAbstract.java   |   35 +
 .../callbacks/UpdatingCallbackFacetViaMethod.java  |   71 ++
 .../callbacks/UpdatingLifecycleEventFacet.java     |   30 +
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 +
 .../choices/ChoicesFacetFromBoundedAbstract.java   |  119 +++
 .../facets/object/choices/ChoicesFacetUtils.java   |   42 +
 .../facets/object/choices/QueryFindAllChoices.java |   57 +
 .../object/choices/enums/ChoicesFacetEnum.java     |   49 +
 .../facets/object/choices/enums/EnumFacet.java     |   26 +
 ...ingValueFacetUsingSemanticsProviderFactory.java |   49 +
 .../choices/enums/EnumValueSemanticsProvider.java  |  152 +++
 .../cssclass/method/CssClassFacetMethod.java       |   61 ++
 .../method/CssClassFacetMethodFactory.java         |   52 +
 ...ssClassFaFacetForDomainObjectLayoutFactory.java |   43 +
 .../CssClassFaFacetForViewModelLayoutFactory.java  |   45 +
 .../facets/object/defaults/DefaultedFacet.java     |   47 +
 .../object/defaults/DefaultedFacetAbstract.java    |   84 ++
 .../DefaultedFacetUsingDefaultsProvider.java       |   47 +
 .../object/defaults/DefaultsProviderUtil.java      |   75 ++
 .../annotcfg/DefaultedFacetAnnotation.java         |   62 ++
 ...tedFacetAnnotationElseConfigurationFactory.java |   71 ++
 .../annotcfg/DefaultedFacetFromConfiguration.java  |   31 +
 .../object/disabled/DisabledObjectFacet.java       |   54 +
 .../disabled/DisabledObjectFacetAbstract.java      |   52 +
 .../method/DisabledObjectFacetViaMethod.java       |   93 ++
 .../DisabledObjectFacetViaMethodFactory.java       |   88 ++
 .../DomainObjectAnnotationFacetFactory.java        |  570 ++++++++++
 .../AuditableFacetForDomainObjectAnnotation.java   |   74 ++
 ...FacetForDomainObjectAnnotationAsConfigured.java |   31 +
 .../auditing/AuditableFacetFromConfiguration.java  |   36 +
 ...AutoCompleteFacetForDomainObjectAnnotation.java |   46 +
 .../ChoicesFacetForDomainObjectAnnotation.java     |   49 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   52 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 +
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 +
 .../ImmutableFacetForDomainObjectAnnotation.java   |  101 ++
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 +
 .../editing/ImmutableFacetFromConfiguration.java   |   58 +
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |   47 +
 ...lishedObjectFacetForDomainObjectAnnotation.java |   67 ++
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 +
 .../PublishedObjectFacetFromConfiguration.java     |   31 +
 ...atableObjectFacetForDomainObjectAnnotation.java |   73 ++
 ...PolicyFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../BookmarkPolicyFacetForDomainObjectXml.java     |   42 +
 ...arkPolicyFacetForViewModelLayoutAnnotation.java |   47 +
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |   55 +
 .../CssClassFaFacetForDomainObjectXml.java         |   44 +
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |   54 +
 ...sClassFacetForDomainObjectLayoutAnnotation.java |   57 +
 .../CssClassFacetForDomainObjectXml.java           |   42 +
 .../CssClassFacetForViewModelLayoutAnnotation.java |   45 +
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  121 +++
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  118 +++
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../DescribedAsFacetForDomainObjectXml.java        |   42 +
 ...scribedAsFacetForViewModelLayoutAnnotation.java |   47 +
 .../DomainObjectLayoutFacetFactory.java            |  113 ++
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  117 ++
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  118 +++
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |  118 +++
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |  117 ++
 .../NamedFacetForDomainObjectLayoutAnnotation.java |   47 +
 .../NamedFacetForDomainObjectXml.java              |   44 +
 .../NamedFacetForViewModelLayoutAnnotation.java    |   45 +
 .../PagedFacetForDomainObjectLayoutAnnotation.java |   46 +
 .../PagedFacetForViewModelLayoutAnnotation.java    |   46 +
 ...PluralFacetForDomainObjectLayoutAnnotation.java |   47 +
 .../PluralFacetForDomainObjectXml.java             |   40 +
 .../PluralFacetForViewModelLayoutAnnotation.java   |   47 +
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  135 +++
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  135 +++
 .../object/domainservice/DomainServiceFacet.java   |   54 +
 .../domainservice/DomainServiceFacetAbstract.java  |   65 ++
 .../annotation/DomainServiceFacetAnnotation.java   |   35 +
 .../DomainServiceFacetAnnotationFactory.java       |  153 +++
 ...conFacetDerivedFromDomainServiceAnnotation.java |   47 +
 .../DomainServiceLayoutFacet.java                  |   36 +
 .../DomainServiceLayoutFacetAbstract.java          |   54 +
 .../DomainServiceLayoutFacetFactory.java           |   70 ++
 ...NamedFacetForDomainServiceLayoutAnnotation.java |   36 +
 .../DomainServiceLayoutFacetAnnotation.java        |   34 +
 .../facets/object/encodeable/EncodableFacet.java   |   42 +
 .../object/encodeable/EncodableFacetAbstract.java  |   85 ++
 .../object/encodeable/EncoderDecoderUtil.java      |   36 +
 .../annotcfg/EncodableFacetFromConfiguration.java  |   33 +
 .../encoder/EncodableFacetUsingEncoderDecoder.java |   75 ++
 .../facets/object/entity/EntityFacet.java          |   54 +
 .../facets/object/facets/FacetsFacet.java          |   48 +
 .../facets/object/facets/FacetsFacetAbstract.java  |   94 ++
 .../facets/annotation/FacetsFacetAnnotation.java   |   32 +
 .../annotation/FacetsFacetAnnotationFactory.java   |   54 +
 .../metamodel/facets/object/grid/GridFacet.java    |   41 +
 .../facets/object/grid/GridFacetDefault.java       |   84 ++
 .../facets/object/grid/GridFacetFactory.java       |   46 +
 .../facets/object/hidden/HiddenObjectFacet.java    |   56 +
 .../object/hidden/HiddenObjectFacetAbstract.java   |   50 +
 .../hidden/method/HiddenObjectFacetViaMethod.java  |   65 ++
 .../method/HiddenObjectFacetViaMethodFactory.java  |   91 ++
 .../metamodel/facets/object/icon/IconFacet.java    |   44 +
 .../facets/object/icon/IconFacetAbstract.java      |   36 +
 .../facets/object/icon/method/IconFacetMethod.java |   52 +
 .../object/icon/method/IconFacetMethodFactory.java |   53 +
 .../RemoveAnnotatedMethodsFacetFactory.java        |   99 ++
 ...oveDatanucleusPersistableTypesFacetFactory.java |   67 ++
 .../RemoveDnPrefixedMethodsFacetFactory.java       |   46 +
 .../javalang/IteratorFilteringFacetFactory.java    |   55 +
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  132 +++
 .../jdo/RemoveJdoEnhancementTypesFacetFactory.java |   66 ++
 .../jdo/RemoveJdoPrefixedMethodsFacetFactory.java  |   48 +
 .../facets/object/immutable/ImmutableFacet.java    |   69 ++
 .../object/immutable/ImmutableFacetAbstract.java   |   61 ++
 .../CopyImmutableFacetOntoMembersFactory.java      |   45 +
 .../facets/object/layout/LayoutFacet.java          |   37 +
 .../facets/object/layout/LayoutFacetAbstract.java  |   41 +
 .../facets/object/layout/LayoutFacetFactory.java   |   56 +
 .../facets/object/layout/LayoutFacetFallback.java  |   44 +
 .../facets/object/layout/LayoutFacetMethod.java    |   54 +
 .../mixin/MetaModelValidatorForMixinTypes.java     |   55 +
 .../metamodel/facets/object/mixin/MixinFacet.java  |   74 ++
 .../facets/object/mixin/MixinFacetAbstract.java    |  143 +++
 .../mixin/MixinFacetForDomainObjectAnnotation.java |   72 ++
 .../object/mixin/MixinFacetForMixinAnnotation.java |   64 ++
 .../mixin/MixinFacetForMixinAnnotationFactory.java |   64 ++
 .../object/navparent/NavigableParentFacet.java     |   43 +
 .../navparent/NavigableParentFacetAbstract.java    |   36 +
 .../NavigableParentAnnotationFacetFactory.java     |  161 +++
 .../method/NavigableParentFacetMethod.java         |   60 ++
 .../object/objectspecid/ObjectSpecIdFacet.java     |   33 +
 .../objectspecid/ObjectSpecIdFacetAbstract.java    |   66 ++
 .../ObjectSpecIdFacetDerivedFromClassName.java     |   35 +
 ...jectSpecIdFacetDerivedFromClassNameFactory.java |  205 ++++
 ...ectSpecIdFacetDerivedFromIoCNamingStrategy.java |   34 +
 .../ObjectSpecIdFacetOnStandaloneList.java         |   31 +
 .../ObjectValidPropertiesFacet.java                |   42 +
 .../ObjectValidPropertiesFacetAbstract.java        |   48 +
 .../impl/ObjectValidPropertiesFacetImpl.java       |   70 ++
 .../ObjectValidPropertiesFacetImplFactory.java     |   35 +
 .../metamodel/facets/object/paged/PagedFacet.java  |   31 +
 .../facets/object/paged/PagedFacetAbstract.java    |   50 +
 .../PagedFacetForPagedAnnotationOnType.java        |   34 +
 .../object/parented/ParentedCollectionFacet.java   |   40 +
 .../parented/ParentedCollectionFacetAbstract.java  |   36 +
 .../object/parseable/InvalidEntryException.java    |   42 +
 .../facets/object/parseable/ParseableFacet.java    |   55 +
 .../object/parseable/ParseableFacetAbstract.java   |   90 ++
 .../facets/object/parseable/ParserUtil.java        |   46 +
 .../object/parseable/TextEntryParseException.java  |   47 +
 .../annotcfg/ParseableFacetFromConfiguration.java  |   33 +
 .../parser/ParseableFacetUsingParser.java          |  132 +++
 .../facets/object/plural/PluralFacet.java          |   41 +
 .../facets/object/plural/PluralFacetAbstract.java  |   42 +
 .../plural/inferred/PluralFacetInferred.java       |   31 +
 .../facets/object/projection/ProjectionFacet.java  |   29 +
 .../object/projection/ProjectionFacetAbstract.java |   42 +
 .../ProjectionFacetFromProjectingProperty.java     |   65 ++
 .../CssClassFacetDerivedFromProjectionFacet.java   |   54 +
 .../ident/IconFacetDerivedFromProjectionFacet.java |   52 +
 .../TitleFacetDerivedFromProjectionFacet.java      |   52 +
 .../object/promptStyle/PromptStyleFacet.java       |   33 +
 .../promptStyle/PromptStyleFacetAbstract.java      |   42 +
 .../promptStyle/PromptStyleFacetAsConfigured.java  |   45 +
 .../PromptStyleFacetFallBackToInline.java          |   37 +
 .../publishedobject/PublishedObjectFacet.java      |   30 +
 .../PublishedObjectFacetAbstract.java              |   38 +
 ...etOnCollectionDerivedFromRecreatableObject.java |   46 +
 ...CollectionDerivedFromViewModelFacetFactory.java |   54 +
 ...acetOnPropertyDerivedFromRecreatableObject.java |   48 +
 ...tyDerivedFromRecreatableObjectFacetFactory.java |   52 +
 .../RecreatableObjectFacetAbstract.java            |  129 +++
 ...ObjectFacetDeclarativeInitializingAbstract.java |  145 +++
 .../recreatable/RecreatableObjectFacetFactory.java |  131 +++
 ...ctFacetForRecreatableDomainObjectInterface.java |   46 +
 ...eObjectFacetForRecreatableObjectAnnotation.java |   34 +
 ...leObjectFacetForRecreatableObjectInterface.java |   45 +
 ...creatableObjectFacetForViewModelAnnotation.java |   35 +
 ...ableObjectFacetForXmlRootElementAnnotation.java |   81 ++
 .../metamodel/facets/object/recreatable/Util.java  |   33 +
 .../metamodel/facets/object/title/TitleFacet.java  |   55 +
 .../facets/object/title/TitleFacetAbstract.java    |   45 +
 .../annotation/TitleAnnotationFacetFactory.java    |  188 ++++
 .../annotation/TitleFacetViaTitleAnnotation.java   |  169 +++
 .../title/methods/TitleFacetViaMethodsFactory.java |   95 ++
 .../title/methods/TitleFacetViaTitleMethod.java    |   93 ++
 .../title/methods/TitleFacetViaToStringMethod.java |   70 ++
 .../object/title/parser/TitleFacetUsingParser.java |   79 ++
 .../validateobject/ValidateObjectFacet.java        |   55 +
 .../ValidateObjectFacetAbstract.java               |   49 +
 .../method/ValidateObjectFacetMethod.java          |   80 ++
 .../method/ValidateObjectFacetMethodFactory.java   |   60 ++
 .../facets/object/value/EqualByContentFacet.java   |   33 +
 .../object/value/EqualByContentFacetAbstract.java  |   36 +
 .../EqualByContentFacetViaValueSemantics.java      |   30 +
 .../value/ImmutableFacetViaValueSemantics.java     |   39 +
 .../object/value/MaxLengthFacetUsingParser.java    |   58 +
 .../value/TypicalLengthFacetUsingParser.java       |   53 +
 .../metamodel/facets/object/value/ValueFacet.java  |   35 +
 .../facets/object/value/ValueFacetAbstract.java    |  155 +++
 .../facets/object/value/ValueFacetSimple.java      |   37 +
 .../value/annotcfg/ValueFacetAnnotation.java       |   81 ++
 ...ValueFacetAnnotationOrConfigurationFactory.java |  113 ++
 .../annotcfg/ValueFacetFromConfiguration.java      |   38 +
 .../vsp/ValueFacetUsingSemanticsProvider.java      |   41 +
 .../ValueFacetUsingSemanticsProviderFactory.java   |   46 +
 .../ValueSemanticsProviderAndFacetAbstract.java    |  328 ++++++
 .../value/vsp/ValueSemanticsProviderUtil.java      |   67 ++
 .../facets/object/viewmodel/ViewModelFacet.java    |  125 +++
 .../facets/object/wizard/WizardFacet.java          |   41 +
 .../facets/object/wizard/WizardFacetAbstract.java  |   36 +
 .../facets/objectvalue/choices/ChoicesFacet.java   |   49 +
 .../objectvalue/choices/ChoicesFacetAbstract.java  |   36 +
 .../objectvalue/fileaccept/FileAcceptFacet.java    |   35 +
 .../fileaccept/FileAcceptFacetAbstract.java        |   37 +
 .../facets/objectvalue/labelat/LabelAtFacet.java   |   36 +
 .../objectvalue/labelat/LabelAtFacetAbstract.java  |   56 +
 .../LabelAtFacetInferredFromMultiLineFacet.java    |   38 +
 .../objectvalue/mandatory/MandatoryFacet.java      |   57 +
 .../mandatory/MandatoryFacetAbstract.java          |  110 ++
 .../mandatory/MandatoryFacetDefault.java           |   43 +
 .../facets/objectvalue/maxlen/MaxLengthFacet.java  |   41 +
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |   75 ++
 .../objectvalue/multiline/MultiLineFacet.java      |   51 +
 .../multiline/MultiLineFacetAbstract.java          |   63 ++
 .../MustSatisfySpecificationFacet.java             |   27 +
 .../MustSatisfySpecificationFacetAbstract.java     |  124 +++
 .../mustsatisfyspec/SpecificationEvaluator.java    |   80 ++
 .../facets/objectvalue/regex/RegExFacet.java       |   38 +
 .../objectvalue/regex/RegExFacetAbstract.java      |  104 ++
 .../renderedadjusted/RenderedAdjustedFacet.java    |   39 +
 .../RenderedAdjustedFacetAbstract.java             |   56 +
 .../objectvalue/typicallen/TypicalLengthFacet.java |   40 +
 .../typicallen/TypicalLengthFacetAbstract.java     |   45 +
 .../ActionParameterAutoCompleteFacet.java          |   47 +
 .../ActionParameterAutoCompleteFacetAbstract.java  |   41 +
 .../facets/param/autocomplete/MinLengthUtil.java   |   56 +
 .../ActionParameterAutoCompleteFacetViaMethod.java |  121 +++
 ...ParameterAutoCompleteFacetViaMethodFactory.java |   88 ++
 ...ameterFromJavaxValidationAnnotationFactory.java |   56 +
 ...rameterFromJavaxValidationDigitsAnnotation.java |   59 ++
 .../facets/param/choices/ActionChoicesFacet.java   |   38 +
 .../param/choices/ActionChoicesFacetAbstract.java  |   36 +
 .../param/choices/ActionParameterChoicesFacet.java |   42 +
 .../ActionParameterChoicesFacetAbstract.java       |   38 +
 .../choices/ActionParameterChoicesFacetNone.java   |   48 +
 ...rameterChoicesFacetDerivedFromChoicesFacet.java |   55 +
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   55 +
 .../method/ActionChoicesFacetViaMethod.java        |  121 +++
 .../method/ActionChoicesFacetViaMethodFactory.java |  100 ++
 .../ActionParameterChoicesFacetViaMethod.java      |  108 ++
 ...ctionParameterChoicesFacetViaMethodFactory.java |   99 ++
 .../defaults/ActionParameterDefaultsFacet.java     |   41 +
 .../ActionParameterDefaultsFacetAbstract.java      |   36 +
 ...ParameterDefaultFacetDerivedFromTypeFacets.java |   60 ++
 ...arameterDefaultFacetDerivedFromTypeFactory.java |   64 ++
 .../ActionParameterDefaultsFacetViaMethod.java     |  117 ++
 ...tionParameterDefaultsFacetViaMethodFactory.java |  134 +++
 ...ameterAnnotationElseDerivedFromTypeFactory.java |   55 +
 ...DescribedAsFacetOnParameterDerivedFromType.java |   32 +
 .../disable/ActionParameterDisabledFacet.java      |   41 +
 .../ActionParameterDisabledFacetAbstract.java      |   49 +
 .../ActionParameterDisabledFacetViaMethod.java     |   95 ++
 ...tionParameterDisabledFacetViaMethodFactory.java |   94 ++
 .../param/hide/ActionParameterHiddenFacet.java     |   42 +
 .../hide/ActionParameterHiddenFacetAbstract.java   |   55 +
 .../ActionParameterHiddenFacetViaMethod.java       |   82 ++
 ...ActionParameterHiddenFacetViaMethodFactory.java |   91 ++
 .../CssClassFacetForParameterLayoutAnnotation.java |   46 +
 ...scribedAsFacetForParameterLayoutAnnotation.java |   46 +
 .../LabelAtFacetForParameterLayoutAnnotation.java  |   47 +
 ...MultiLineFacetForParameterLayoutAnnotation.java |   45 +
 .../NamedFacetForParameterLayoutAnnotation.java    |   51 +
 .../param/layout/ParameterLayoutFacetFactory.java  |   58 +
 ...dAdjustedFacetForParameterLayoutAnnotation.java |   58 +
 ...calLengthFacetForParameterLayoutAnnotation.java |   60 ++
 .../MandatoryFacetOnParametersDefaultFactory.java  |   56 +
 .../NamedFacetForParameterUsingReflection.java     |   34 +
 .../ParameterNameFacetFactoryUsingReflection.java  |   74 ++
 .../parameter/ParameterAnnotationFacetFactory.java |  134 +++
 .../FileAcceptFacetForParameterAnnotation.java     |   47 +
 .../MandatoryFacetForParameterAnnotation.java      |   81 ++
 ...cetInvertedByNullableAnnotationOnParameter.java |   59 ++
 .../MaxLengthFacetForParameterAnnotation.java      |   46 +
 ...fySpecificationFacetForParameterAnnotation.java |   69 ++
 .../regex/RegExFacetForParameterAnnotation.java    |   72 ++
 .../RegExFacetForPatternAnnotationOnParameter.java |   66 ++
 .../TypicalLengthFacetOnParameterAnnotation.java   |   50 +
 ...picalLengthFacetOnParameterDerivedFromType.java |   49 +
 ...acetOnParameterDerivedFromTypeFacetFactory.java |   56 +
 .../validate/ActionParameterValidationFacet.java   |   46 +
 .../ActionParameterValidationFacetAbstract.java    |   47 +
 .../ActionParameterValidationFacetViaMethod.java   |   84 ++
 ...onParameterValidationFacetViaMethodFactory.java |   83 ++
 .../PropertyOrCollectionAccessorFacet.java         |   53 +
 .../PropertyOrCollectionAccessorFacetAbstract.java |   57 +
 .../propcoll/notpersisted/NotPersistedFacet.java   |   38 +
 .../notpersisted/NotPersistedFacetAbstract.java    |   36 +
 .../accessor/PropertyAccessorFacetViaAccessor.java |   96 ++
 .../PropertyAccessorFacetViaAccessorFactory.java   |  113 ++
 .../autocomplete/PropertyAutoCompleteFacet.java    |   51 +
 .../PropertyAutoCompleteFacetAbstract.java         |   39 +
 .../method/PropertyAutoCompleteFacetMethod.java    |  114 ++
 .../PropertyAutoCompleteFacetMethodFactory.java    |   79 ++
 ...ropertyFromJavaxValidationDigitsAnnotation.java |   60 ++
 ...FromJavaxValidationDigitsAnnotationFactory.java |   59 ++
 .../properties/businesskey/BusinessKeyFacet.java   |   36 +
 .../businesskey/BusinessKeyFacetAbstract.java      |   36 +
 .../properties/choices/PropertyChoicesFacet.java   |   50 +
 .../choices/PropertyChoicesFacetAbstract.java      |   36 +
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |   52 +
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   45 +
 .../method/PropertyChoicesFacetViaMethod.java      |   93 ++
 .../PropertyChoicesFacetViaMethodFactory.java      |   77 ++
 .../properties/defaults/PropertyDefaultFacet.java  |   46 +
 .../defaults/PropertyDefaultFacetAbstract.java     |   36 +
 .../defaults/PropertyDefaultFacetNone.java         |   44 +
 ...pertyDefaultFacetDerivedFromDefaultedFacet.java |   57 +
 ...PropertyDefaultFacetDerivedFromTypeFactory.java |   64 ++
 .../method/PropertyDefaultFacetViaMethod.java      |   88 ++
 .../PropertyDefaultFacetViaMethodFactory.java      |   77 ++
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   38 +
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   52 +
 .../inferred/DisabledFacetOnPropertyInferred.java  |   32 +
 .../DisabledFacetOnPropertyInferredFactory.java    |   56 +
 .../MandatoryFacetOnProperyDefaultFactory.java     |   57 +
 .../MultiLineFacetOnPropertyAnnotation.java        |   35 +
 .../properties/projection/ProjectingFacet.java     |   30 +
 .../projection/ProjectingFacetAbstract.java        |   41 +
 .../ProjectingFacetFromPropertyAnnotation.java     |   70 ++
 .../property/PropertyAnnotationFacetFactory.java   |  377 +++++++
 .../command/CommandFacetForPropertyAnnotation.java |   99 ++
 ...mandFacetForPropertyAnnotationAsConfigured.java |   37 +
 .../DisabledFacetForPropertyAnnotation.java        |   65 ++
 ...acetForPropertyAnnotationInvertedSemantics.java |   32 +
 .../FileAcceptFacetForPropertyAnnotation.java      |   47 +
 .../hidden/HiddenFacetForPropertyAnnotation.java   |   56 +
 .../MandatoryFacetForPropertyAnnotation.java       |   90 ++
 ...acetInvertedByNullableAnnotationOnProperty.java |   61 ++
 .../MaxLengthFacetForPropertyAnnotation.java       |   46 +
 ...ropertyClearFacetForDomainEventFromDefault.java |   41 +
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 +
 .../property/modify/PropertyDomainEventFacet.java  |   33 +
 .../modify/PropertyDomainEventFacetAbstract.java   |  167 +++
 .../modify/PropertyDomainEventFacetDefault.java    |   40 +
 ...pertyDomainEventFacetForPropertyAnnotation.java |   40 +
 ...opertySetterFacetForDomainEventFromDefault.java |   42 +
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 +
 ...tySetterOrClearFacetForDomainEventAbstract.java |  340 ++++++
 .../facets/properties/property/modify/Utils.java   |   23 +
 ...sfySpecificationFacetForPropertyAnnotation.java |   66 ++
 .../NotPersistedFacetForPropertyAnnotation.java    |   46 +
 ...ublishedPropertyFacetForPropertyAnnotation.java |   79 ++
 ...ertyFacetForPropertyAnnotationAsConfigured.java |   27 +
 .../PublishedPropertyFacetFromConfiguration.java   |   31 +
 .../RegExFacetForPatternAnnotationOnProperty.java  |   76 ++
 .../regex/RegExFacetForPropertyAnnotation.java     |   70 ++
 .../CssClassFacetForPropertyLayoutAnnotation.java  |   47 +
 .../CssClassFacetForPropertyXml.java               |   42 +
 ...escribedAsFacetForPropertyLayoutAnnotation.java |   47 +
 .../DescribedAsFacetForPropertyXml.java            |   42 +
 .../HiddenFacetForPropertyLayoutAnnotation.java    |   56 +
 .../propertylayout/HiddenFacetForPropertyXml.java  |   51 +
 .../LabelAtFacetForPropertyLayoutAnnotation.java   |   47 +
 .../propertylayout/LabelAtFacetForPropertyXml.java |   42 +
 .../MultiLineFacetForPropertyLayoutAnnotation.java |   46 +
 .../MultiLineFacetForPropertyXml.java              |   41 +
 .../NamedFacetForPropertyLayoutAnnotation.java     |   51 +
 .../propertylayout/NamedFacetForPropertyXml.java   |   47 +
 ...romptStyleFacetForPropertyLayoutAnnotation.java |   96 ++
 .../PromptStyleFacetForPropertyXml.java            |   57 +
 .../propertylayout/PropertyLayoutFacetFactory.java |  194 ++++
 ...edAdjustedFacetForPropertyLayoutAnnotation.java |   58 +
 .../RenderedAdjustedFacetForPropertyXml.java       |   45 +
 ...icalLengthFacetForPropertyLayoutAnnotation.java |   61 ++
 .../TypicalLengthFacetForPropertyXml.java          |   57 +
 ...UnchangingFacetForPropertyLayoutAnnotation.java |   59 ++
 .../UnchangingFacetForPropertyXml.java             |   42 +
 .../properties/publish/PublishedPropertyFacet.java |   29 +
 .../publish/PublishedPropertyFacetAbstract.java    |   38 +
 ...nderedAsDayBeforeFacetAnnotationOnProperty.java |   38 +
 .../renderunchanged/UnchangingFacet.java           |   30 +
 .../renderunchanged/UnchangingFacetAbstract.java   |   36 +
 .../properties/searchable/SearchableFacet.java     |   49 +
 .../searchable/SearchableFacetAbstract.java        |   51 +
 .../TypicalLengthFacetOnPropertyAnnotation.java    |   50 +
 ...ypicalLengthFacetOnPropertyDerivedFromType.java |   49 +
 ...FacetOnPropertyDerivedFromTypeFacetFactory.java |   55 +
 .../update/NotPersistableFacetInferred.java        |   31 +
 .../update/PropertyModifyFacetFactory.java         |   68 ++
 .../update/PropertySetAndClearFacetFactory.java    |  122 +++
 .../update/clear/PropertyClearFacet.java           |   43 +
 .../update/clear/PropertyClearFacetAbstract.java   |   35 +
 .../clear/PropertyClearFacetViaClearMethod.java    |   74 ++
 .../clear/PropertyClearFacetViaSetterMethod.java   |   75 ++
 .../update/init/PropertyInitializationFacet.java   |   50 +
 .../init/PropertyInitializationFacetAbstract.java  |   35 +
 ...PropertyInitializationFacetViaSetterMethod.java |   70 ++
 .../update/modify/PropertySetterFacet.java         |   51 +
 .../update/modify/PropertySetterFacetAbstract.java |   35 +
 .../modify/PropertySetterFacetViaModifyMethod.java |   81 ++
 .../modify/PropertySetterFacetViaSetterMethod.java |   76 ++
 .../validating/PropertyValidateFacet.java          |   50 +
 .../validating/PropertyValidateFacetAbstract.java  |   57 +
 .../validating/PropertyValidateFacetNone.java      |   47 +
 .../dflt/PropertyValidateFacetDefault.java         |   49 +
 .../dflt/PropertyValidateFacetDefaultFactory.java  |   58 +
 .../method/PropertyValidateFacetViaMethod.java     |   83 ++
 .../PropertyValidateFacetViaMethodFactory.java     |   76 ++
 .../DateAndTimeValueSemanticsProviderAbstract.java |  116 ++
 .../core/metamodel/facets/value/JodaFunctions.java |   43 +
 .../ValueSemanticsProviderAbstractTemporal.java    |  373 +++++++
 .../value/bigdecimal/BigDecimalValueFacet.java     |   60 ++
 .../bigdecimal/BigDecimalValueFacetAbstract.java   |   37 +
 ...malValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../BigDecimalValueSemanticsProvider.java          |  143 +++
 .../value/biginteger/BigIntegerValueFacet.java     |   26 +
 ...gerValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../BigIntegerValueSemanticsProvider.java          |  110 ++
 .../facets/value/blobs/BlobValueFacet.java         |   26 +
 ...lobValueFacetUsingSemanticsProviderFactory.java |   41 +
 .../value/blobs/BlobValueSemanticsProvider.java    |  123 +++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../BooleanPrimitiveValueSemanticsProvider.java    |   55 +
 .../facets/value/booleans/BooleanValueFacet.java   |   29 +
 .../BooleanValueSemanticsProviderAbstract.java     |  129 +++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../BooleanWrapperValueSemanticsProvider.java      |   69 ++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../bytes/BytePrimitiveValueSemanticsProvider.java |   52 +
 .../facets/value/bytes/ByteValueFacet.java         |   30 +
 .../bytes/ByteValueSemanticsProviderAbstract.java  |  116 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../bytes/ByteWrapperValueSemanticsProvider.java   |   41 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../chars/CharPrimitiveValueSemanticsProvider.java |   54 +
 .../facets/value/chars/CharValueFacet.java         |   30 +
 .../chars/CharValueSemanticsProviderAbstract.java  |  103 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../chars/CharWrapperValueSemanticsProvider.java   |   41 +
 .../facets/value/clobs/ClobValueFacet.java         |   26 +
 ...lobValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../value/clobs/ClobValueSemanticsProvider.java    |  117 ++
 .../facets/value/date/DateValueFacet.java          |   33 +
 .../date/DateValueSemanticsProviderAbstract.java   |  121 +++
 .../value/datejdk8local/Jdk8LocalDateUtil.java     |  170 +++
 .../datejdk8local/Jdk8LocalDateValueFacet.java     |   33 +
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8LocalDateValueSemanticsProvider.java       |  252 +++++
 .../facets/value/datejdk8local/TimeFormatter.java  |   27 +
 .../facets/value/datejdk8local/TimeParser.java     |   27 +
 .../value/datejodalocal/JodaLocalDateUtil.java     |  130 +++
 .../datejodalocal/JodaLocalDateValueFacet.java     |   33 +
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaLocalDateValueSemanticsProvider.java       |  257 +++++
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../datesql/JavaSqlDateValueSemanticsProvider.java |   98 ++
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   |  157 +++
 .../Jdk8LocalDateTimeValueFacet.java               |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  272 +++++
 .../value/datetimejdk8local/TimeFormatter.java     |   27 +
 .../facets/value/datetimejdk8local/TimeParser.java |   27 +
 .../Jdk8OffsetDateTimeValueFacet.java              |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  |  103 ++
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  121 +++
 .../value/datetimejoda/JodaDateTimeValueFacet.java |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaDateTimeValueSemanticsProvider.java        |  103 ++
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  121 +++
 .../datetimejodalocal/JodaLocalDateTimeUtil.java   |  127 +++
 .../JodaLocalDateTimeValueFacet.java               |   33 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 +
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  259 +++++
 ...ateValueFacetUsingSemanticsProviderFactory.java |   46 +
 .../JavaUtilDateValueSemanticsProvider.java        |   85 ++
 .../doubles/DoubleFloatingPointValueFacet.java     |   30 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../DoublePrimitiveValueSemanticsProvider.java     |   54 +
 .../DoubleValueSemanticsProviderAbstract.java      |  120 +++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../DoubleWrapperValueSemanticsProvider.java       |   42 +
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../FloatPrimitiveValueSemanticsProvider.java      |   54 +
 .../FloatValueSemanticsProviderAbstract.java       |  116 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../floats/FloatWrapperValueSemanticsProvider.java |   41 +
 .../value/floats/FloatingPointValueFacet.java      |   30 +
 .../facets/value/image/ImageValueFacet.java        |   34 +
 ...ageValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../value/image/ImageValueSemanticsProvider.java   |  100 ++
 .../image/ImageValueSemanticsProviderAbstract.java |  298 ++++++
 ...ageValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../JavaAwtImageValueSemanticsProvider.java        |   83 ++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../IntPrimitiveValueSemanticsProvider.java        |   54 +
 .../integer/IntValueSemanticsProviderAbstract.java |  114 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../integer/IntWrapperValueSemanticsProvider.java  |   41 +
 .../facets/value/integer/IntegerValueFacet.java    |   30 +
 .../localrespath/LocalResourcePathValueFacet.java  |   32 +
 ...athValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../LocalResourcePathValueSemanticsProvider.java   |  130 +++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../longs/LongPrimitiveValueSemanticsProvider.java |   52 +
 .../facets/value/longs/LongValueFacet.java         |   30 +
 .../longs/LongValueSemanticsProviderAbstract.java  |  113 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../longs/LongWrapperValueSemanticsProvider.java   |   41 +
 .../facets/value/markup/MarkupValueFacet.java      |   30 +
 ...kupValueFacetUsingSemanticsProviderFactory.java |   38 +
 .../value/markup/MarkupValueSemanticsProvider.java |  114 ++
 .../facets/value/password/PasswordValueFacet.java  |   33 +
 ...ordValueFacetUsingSemanticsProviderFactory.java |   43 +
 .../password/PasswordValueSemanticsProvider.java   |  119 +++
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../ShortPrimitiveValueSemanticsProvider.java      |   52 +
 .../facets/value/shortint/ShortValueFacet.java     |   30 +
 .../ShortValueSemanticsProviderAbstract.java       |  115 ++
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../ShortWrapperValueSemanticsProvider.java        |   41 +
 .../facets/value/string/StringValueFacet.java      |   31 +
 ...ingValueFacetUsingSemanticsProviderFactory.java |   42 +
 .../value/string/StringValueSemanticsProvider.java |  126 +++
 .../time/TimeValueSemanticsProviderAbstract.java   |  110 ++
 .../JodaLocalTimeValueFacetSimpleFactory.java      |   46 +
 ...imeValueFacetUsingSemanticsProviderFactory.java |   46 +
 .../timesql/JavaSqlTimeValueSemanticsProvider.java |   95 ++
 ...ampValueFacetUsingSemanticsProviderFactory.java |   47 +
 .../JavaSqlTimeStampValueSemanticsProvider.java    |   84 ++
 .../TimeStampValueSemanticsProviderAbstract.java   |  101 ++
 .../facets/value/treenode/TreeNodeValueFacet.java  |   27 +
 ...odeValueFacetUsingSemanticsProviderFactory.java |   40 +
 .../treenode/TreeNodeValueSemanticsProvider.java   |  136 +++
 .../metamodel/facets/value/url/URLValueFacet.java  |   31 +
 ...URLValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../value/url/URLValueSemanticsProvider.java       |  127 +++
 .../facets/value/uuid/UUIDValueFacet.java          |   33 +
 ...UIDValueFacetUsingSemanticsProviderFactory.java |   44 +
 .../value/uuid/UUIDValueSemanticsProvider.java     |  112 ++
 .../core/metamodel/interactions/AccessContext.java |   42 +
 .../interactions/ActionArgUsabilityContext.java    |   76 ++
 .../interactions/ActionArgValidityContext.java     |   68 ++
 .../interactions/ActionArgVisibilityContext.java   |   76 ++
 .../interactions/ActionInteractionContext.java     |   31 +
 .../interactions/ActionUsabilityContext.java       |   60 ++
 .../interactions/ActionValidityContext.java        |   64 ++
 .../interactions/ActionVisibilityContext.java      |   60 ++
 .../interactions/CollectionAccessContext.java      |   48 +
 .../interactions/CollectionAddToContext.java       |   56 +
 .../interactions/CollectionRemoveFromContext.java  |   58 +
 .../interactions/CollectionUsabilityContext.java   |   48 +
 .../interactions/CollectionVisibilityContext.java  |   50 +
 .../interactions/DisablingInteractionAdvisor.java  |   46 +
 .../interactions/HidingInteractionAdvisor.java     |   47 +
 .../interactions/InteractionAdvisorFacet.java      |   45 +
 .../metamodel/interactions/InteractionContext.java |  171 +++
 .../metamodel/interactions/InteractionUtils.java   |   81 ++
 .../metamodel/interactions/ObjectTitleContext.java |   56 +
 .../interactions/ObjectValidityContext.java        |   53 +
 .../interactions/ObjectVisibilityContext.java      |   55 +
 .../metamodel/interactions/ParseValueContext.java  |   59 ++
 .../interactions/PropertyAccessContext.java        |   60 ++
 .../interactions/PropertyModifyContext.java        |   61 ++
 .../interactions/PropertyUsabilityContext.java     |   50 +
 .../interactions/PropertyVisibilityContext.java    |   50 +
 .../metamodel/interactions/ProposedHolder.java     |   38 +
 .../metamodel/interactions/UsabilityContext.java   |   55 +
 .../interactions/ValidatingInteractionAdvisor.java |   51 +
 .../metamodel/interactions/ValidityContext.java    |   42 +
 .../metamodel/interactions/VisibilityContext.java  |   54 +
 .../isis/core/metamodel/layout/DeweyOrderSet.java  |  404 +++++++
 .../MemberIdentifierComparator.java                |   44 +
 .../memberorderfacet/MemberOrderComparator.java    |   90 ++
 .../MemberOrderFacetComparator.java                |   56 +
 .../OrderSetGroupNameComparator.java               |   55 +
 .../metamodel/objectmanager/ObjectManager.java     |  107 ++
 .../objectmanager/ObjectManagerDefault.java        |   77 ++
 .../objectmanager/create/ObjectCreator.java        |   82 ++
 .../create/ObjectCreator_builtinHandlers.java      |  386 +++++++
 .../objectmanager/identify/ObjectIdentifier.java   |   63 ++
 .../identify/ObjectIdentifier_builtinHandlers.java |  139 +++
 .../metamodel/objectmanager/load/ObjectLoader.java |   80 ++
 .../load/ObjectLoader_builtinHandlers.java         |  258 +++++
 .../objectmanager/refresh/ObjectRefresher.java     |   67 ++
 .../refresh/ObjectRefresher_builtinHandlers.java   |  107 ++
 ...arameterChoicesFacetFromParentedCollection.java |   76 ++
 ...meterDefaultsFacetFromAssociatedCollection.java |   64 ++
 .../param/DeriveFacetsPostProcessor.java           |  635 +++++++++++
 .../ObjectSpecificationPostProcessor.java          |   28 +
 .../core/metamodel/progmodel/ProgrammingModel.java |  179 ++++
 .../progmodel/ProgrammingModelAbstract.java        |  253 +++++
 .../progmodel/ProgrammingModelInitFilter.java      |   80 ++
 .../ProgrammingModelInitFilterDefault.java         |   85 ++
 .../progmodel/ProgrammingModelService.java         |   32 +
 .../dflt/ProgrammingModelFacetsJava8.java          |  388 +++++++
 .../core/metamodel/services/CollectionHelper.java  |  100 ++
 .../metamodel/services/ServiceInjectorDefault.java |   75 ++
 .../metamodel/services/ServiceInjectorLegacy.java  |  286 +++++
 .../isis/core/metamodel/services/ServiceUtil.java  |   41 +
 .../services/appfeat/ApplicationFeature.java       |  324 ++++++
 .../appfeat/ApplicationFeatureFactory.java         |   45 +
 .../services/appfeat/ApplicationFeatureId.java     |  492 +++++++++
 .../ApplicationFeatureRepositoryDefault.java       |  556 ++++++++++
 .../services/appfeat/ApplicationFeatureType.java   |  102 ++
 .../classsubstitutor/ClassSubstitutor.java         |   28 +
 .../classsubstitutor/ClassSubstitutorAbstract.java |  137 +++
 .../classsubstitutor/ClassSubstitutorDefault.java  |   76 ++
 .../ClassSubstitutorForCollections.java            |   64 ++
 .../classsubstitutor/ClassSubstitutorRegistry.java |   80 ++
 .../command/CommandDtoServiceInternal.java         |   71 ++
 .../services/container/query/QueryCardinality.java |   31 +
 .../metamodel/services/devutils/MemberType.java    |   25 +
 .../services/events/MetamodelEventService.java     |   94 ++
 .../events/MetamodelEventSupport_Spring.java       |   77 ++
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   88 ++
 .../services/grid/GridLoaderServiceDefault.java    |  257 +++++
 .../services/grid/GridReaderUsingJaxb.java         |   76 ++
 .../services/grid/GridServiceDefault.java          |  209 ++++
 .../services/grid/GridSystemServiceAbstract.java   |  699 ++++++++++++
 .../grid/bootstrap3/DefaultGrid.layout.xml         |    0
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  674 ++++++++++++
 .../services/homepage/HomePageAction.java          |   63 ++
 .../services/homepage/HomePageResolverService.java |   35 +
 .../metamodel/services/homepage/package-info.java  |   26 +
 .../ixn/InteractionDtoServiceInternal.java         |   51 +
 .../services/layout/LayoutServiceDefault.java      |  147 +++
 .../services/message/MessageServiceNoop.java       |   88 ++
 .../services/metamodel/DomainMemberDefault.java    |  301 ++++++
 .../services/metamodel/DomainModelDefault.java     |   58 +
 .../services/metamodel/MetaModelExportSupport.java |   31 +
 .../services/metamodel/MetaModelExporter.java      |  570 ++++++++++
 .../metamodel/MetaModelServiceDefault.java         |  272 +++++
 .../core/metamodel/services/metamodel/Util.java    |   35 +
 .../publishing/PublisherDispatchService.java       |   46 +
 .../services/registry/ServiceRegistryDefault.java  |  103 ++
 .../services/registry/SpringContextProvider.java   |   23 +
 .../services/title/TitleServiceDefault.java        |   83 ++
 .../title/TitlesAndTranslationsValidator.java      |  166 +++
 .../services/user/UserServiceDefault.java          |  177 ++++
 .../isis/core/metamodel/spec/ActionType.java       |   41 +
 .../isis/core/metamodel/spec/DefaultProvider.java  |   31 +
 .../apache/isis/core/metamodel/spec/Described.java |   35 +
 .../core/metamodel/spec/DomainModelException.java  |   47 +
 .../spec/ElementSpecificationProvider.java         |   44 +
 .../isis/core/metamodel/spec/EntityState.java      |   49 +
 .../isis/core/metamodel/spec/FreeStandingList.java |   96 ++
 .../isis/core/metamodel/spec/Hierarchical.java     |   65 ++
 .../metamodel/spec/InjectorMethodEvaluator.java    |   31 +
 .../isis/core/metamodel/spec/ManagedObject.java    |  734 +++++++++++++
 .../spec/ObjectInstantiationException.java         |   41 +
 .../isis/core/metamodel/spec/ObjectSpecId.java     |   62 ++
 .../core/metamodel/spec/ObjectSpecification.java   |  445 ++++++++
 .../spec/ObjectSpecificationException.java         |   36 +
 .../isis/core/metamodel/spec/Specification.java    |   50 +
 .../core/metamodel/spec/feature/Contributed.java   |   31 +
 .../core/metamodel/spec/feature/CurrentHolder.java |   46 +
 .../spec/feature/MutableCurrentHolder.java         |   64 ++
 .../core/metamodel/spec/feature/ObjectAction.java  |  589 +++++++++++
 .../spec/feature/ObjectActionContainer.java        |   80 ++
 .../spec/feature/ObjectActionParameter.java        |  235 ++++
 .../metamodel/spec/feature/ObjectAssociation.java  |  253 +++++
 .../spec/feature/ObjectAssociationContainer.java   |   72 ++
 .../core/metamodel/spec/feature/ObjectFeature.java |   79 ++
 .../core/metamodel/spec/feature/ObjectMember.java  |  228 ++++
 .../spec/feature/OneToManyActionParameter.java     |   28 +
 .../spec/feature/OneToManyAssociation.java         |  101 ++
 .../metamodel/spec/feature/OneToManyFeature.java   |   40 +
 .../spec/feature/OneToOneActionParameter.java      |   28 +
 .../spec/feature/OneToOneAssociation.java          |   53 +
 .../metamodel/spec/feature/OneToOneFeature.java    |   28 +
 .../core/metamodel/specloader/CollectionUtils.java |   61 ++
 .../specloader/InjectorMethodEvaluatorDefault.java |   91 ++
 .../specloader/ProgrammingModelServiceDefault.java |  104 ++
 .../specloader/ReflectiveActionException.java      |   43 +
 .../specloader/SpecificationCacheDefault.java      |  134 +++
 .../metamodel/specloader/SpecificationLoader.java  |  137 +++
 .../specloader/SpecificationLoaderDefault.java     |  521 +++++++++
 .../SpecificationLoaderDefault_debug.java          |   79 ++
 .../specloader/classsubstitutor/ProxyEnhanced.java |   28 +
 .../specloader/facetprocessor/FacetProcessor.java  |  486 +++++++++
 .../core/metamodel/specloader/package-info.java    |   43 +
 .../specloader/postprocessor/PostProcessor.java    |   59 ++
 .../specloader/specimpl/ContributeeMember.java     |   67 ++
 .../specloader/specimpl/FacetedMethodsBuilder.java |  614 +++++++++++
 .../metamodel/specloader/specimpl/Factories.java   |   96 ++
 .../specloader/specimpl/IntrospectionState.java    |   47 +
 .../specloader/specimpl/MixedInMember.java         |   40 +
 .../specimpl/ObjectActionContributee.java          |  253 +++++
 .../specloader/specimpl/ObjectActionDefault.java   |  688 ++++++++++++
 .../specloader/specimpl/ObjectActionMixedIn.java   |  260 +++++
 .../specimpl/ObjectActionParameterAbstract.java    |  492 +++++++++
 .../specimpl/ObjectActionParameterContributee.java |   25 +
 .../ObjectActionParameterContributeeAbstract.java  |   93 ++
 .../specimpl/ObjectActionParameterMixedIn.java     |   25 +
 .../ObjectActionParameterMixedInAbstract.java      |   85 ++
 .../specimpl/ObjectAssociationAbstract.java        |   97 ++
 .../specloader/specimpl/ObjectMemberAbstract.java  |  409 +++++++
 .../specimpl/ObjectSpecificationAbstract.java      | 1119 ++++++++++++++++++++
 .../OneToManyActionParameterContributee.java       |   43 +
 .../specimpl/OneToManyActionParameterDefault.java  |   43 +
 .../specimpl/OneToManyActionParameterMixedIn.java  |   40 +
 .../specimpl/OneToManyAssociationContributee.java  |  191 ++++
 .../specimpl/OneToManyAssociationDefault.java      |  288 +++++
 .../specimpl/OneToManyAssociationMixedIn.java      |  221 ++++
 .../OneToOneActionParameterContributee.java        |   38 +
 .../specimpl/OneToOneActionParameterDefault.java   |   37 +
 .../specimpl/OneToOneActionParameterMixedIn.java   |   35 +
 .../specimpl/OneToOneAssociationContributee.java   |  174 +++
 .../specimpl/OneToOneAssociationDefault.java       |  361 +++++++
 .../specimpl/OneToOneAssociationMixedIn.java       |  206 ++++
 .../metamodel/specloader/specimpl/Predicates.java  |  168 +++
 .../core/metamodel/specloader/specimpl/Utils.java  |  103 ++
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  456 ++++++++
 .../CollectionFacetOnStandaloneList.java           |   73 ++
 .../DescribedAsFacetOnStandaloneList.java          |   31 +
 .../standalonelist/NamedFacetOnStandaloneList.java |   31 +
 .../ObjectSpecificationOnStandaloneList.java       |  186 ++++
 .../PluralFacetOnStandaloneList.java               |   31 +
 .../traverser/TypeExtractorAbstract.java           |   84 ++
 .../traverser/TypeExtractorMethodParameters.java   |   60 ++
 .../traverser/TypeExtractorMethodReturn.java       |   47 +
 .../validator/MetaModelInvalidException.java       |   33 +
 .../specloader/validator/MetaModelValidator.java   |   44 +
 .../validator/MetaModelValidatorAbstract.java      |   69 ++
 ...etaModelValidatorForConflictingOptionality.java |   62 ++
 .../MetaModelValidatorForDeprecatedAbstract.java   |   68 ++
 .../MetaModelValidatorForDeprecatedAnnotation.java |   54 +
 ...etaModelValidatorForDeprecatedMethodPrefix.java |   52 +
 .../MetaModelValidatorForValidationFailures.java   |   23 +
 .../validator/MetaModelValidatorVisiting.java      |  111 ++
 .../specloader/validator/ValidationFailure.java    |   61 ++
 .../specloader/validator/ValidationFailures.java   |  112 ++
 .../core/metamodel/util/DeweyOrderComparator.java  |   37 +
 .../apache/isis/core/metamodel/util/EventUtil.java |   43 +
 .../core/metamodel/util/pchain/ParentChain.java    |   83 ++
 .../metamodel/util/pchain/ParentChainDefault.java  |   49 +
 .../isis/core/metamodel/util/snapshot/Helper.java  |   91 ++
 .../core/metamodel/util/snapshot/IsisSchema.java   |  181 ++++
 .../isis/core/metamodel/util/snapshot/Place.java   |   65 ++
 .../core/metamodel/util/snapshot/XmlSchema.java    |  648 ++++++++++++
 .../core/metamodel/util/snapshot/XmlSnapshot.java  |  916 ++++++++++++++++
 .../core/metamodel/util/snapshot/XsMetaModel.java  |  337 ++++++
 .../metamodel/valuetypes/ValueTypeDefinition.java  |   45 +
 .../metamodel/valuetypes/ValueTypeProvider.java    |   29 +
 .../valuetypes/ValueTypeProviderDefault.java       |   54 +
 .../ValueTypeProviderForCollections.java           |   51 +
 .../metamodel/valuetypes/ValueTypeRegistry.java    |   96 ++
 .../apache/isis/metamodel/IsisModuleMetamodel.java |  101 --
 .../isis/metamodel/adapter/ObjectAdapter.java      |   61 --
 .../metamodel/adapter/ObjectAdapterProvider.java   |   35 -
 .../adapter/oid/ObjectNotFoundException.java       |   36 -
 .../adapter/oid/ObjectPersistenceException.java    |   42 -
 .../org/apache/isis/metamodel/adapter/oid/Oid.java |  140 ---
 .../isis/metamodel/adapter/oid/Oid_Marshaller.java |  254 -----
 .../isis/metamodel/adapter/oid/Oid_Parented.java   |  146 ---
 .../isis/metamodel/adapter/oid/Oid_Root.java       |  167 ---
 .../isis/metamodel/adapter/oid/Oid_Value.java      |   87 --
 .../isis/metamodel/adapter/oid/ParentedOid.java    |   54 -
 .../adapter/oid/PojoRecreationException.java       |   29 -
 .../adapter/oid/PojoRefreshException.java          |   32 -
 .../apache/isis/metamodel/adapter/oid/RootOid.java |   46 -
 .../isis/metamodel/adapter/package-info.java       |   32 -
 .../authorization/standard/AuthorizationFacet.java |   32 -
 .../standard/AuthorizationFacetAbstract.java       |   78 --
 .../standard/AuthorizationFacetFactory.java        |   46 -
 .../standard/AuthorizationFacetImpl.java           |   30 -
 .../authorization/standard/package-info.java       |   33 -
 .../isis/metamodel/commons/ArrayExtensions.java    |   69 --
 .../apache/isis/metamodel/commons/CanBeVoid.java   |   25 -
 .../isis/metamodel/commons/ClassExtensions.java    |  175 ---
 .../isis/metamodel/commons/ClassFunctions.java     |   46 -
 .../isis/metamodel/commons/ClassPredicates.java    |   37 -
 .../apache/isis/metamodel/commons/ClassUtil.java   |  192 ----
 .../metamodel/commons/CloseableExtensions.java     |   40 -
 .../isis/metamodel/commons/DateExtensions.java     |   35 -
 .../metamodel/commons/InputStreamExtensions.java   |   69 --
 .../isis/metamodel/commons/ListExtensions.java     |  115 --
 .../apache/isis/metamodel/commons/LocaleUtil.java  |   40 -
 .../org/apache/isis/metamodel/commons/MapUtil.java |   48 -
 .../isis/metamodel/commons/MethodExtensions.java   |   92 --
 .../commons/MethodInvocationPreprocessor.java      |  154 ---
 .../apache/isis/metamodel/commons/MethodUtil.java  |  202 ----
 .../isis/metamodel/commons/ObjectExtensions.java   |   82 --
 .../isis/metamodel/commons/ResourceUtil.java       |   83 --
 .../isis/metamodel/commons/StringExtensions.java   |  393 -------
 .../metamodel/commons/ThrowableExtensions.java     |   82 --
 .../apache/isis/metamodel/commons/ToString.java    |  165 ---
 .../apache/isis/metamodel/commons/Wormhole.java    |   50 -
 .../isis/metamodel/commons/package-info.java       |   27 -
 .../org/apache/isis/metamodel/consent/Allow.java   |   56 -
 .../org/apache/isis/metamodel/consent/Consent.java |   73 --
 .../isis/metamodel/consent/ConsentAbstract.java    |  159 ---
 .../isis/metamodel/consent/InteractionAdvisor.java |  103 --
 .../metamodel/consent/InteractionContextType.java  |  135 ---
 .../metamodel/consent/InteractionInitiatedBy.java  |   33 -
 .../isis/metamodel/consent/InteractionResult.java  |  155 ---
 .../metamodel/consent/InteractionResultSet.java    |  104 --
 .../org/apache/isis/metamodel/consent/Veto.java    |   48 -
 .../isis/metamodel/context/MetaModelContext.java   |  212 ----
 .../metamodel/context/MetaModelContextAware.java   |   29 -
 .../context/MetaModelContext_usingIoc.java         |  172 ---
 .../isis/metamodel/context/MetaModelContexts.java  |   44 -
 .../metamodel/exceptions/MetaModelException.java   |   43 -
 .../persistence/ObjectNotFoundException.java       |   38 -
 .../persistence/ObjectPersistenceException.java    |   42 -
 .../persistence/PojoRecreationException.java       |   31 -
 .../persistence/PojoRefreshException.java          |   34 -
 .../org/apache/isis/metamodel/facetapi/Facet.java  |  123 ---
 .../isis/metamodel/facetapi/FacetAbstract.java     |  287 -----
 .../isis/metamodel/facetapi/FacetHolder.java       |  150 ---
 .../isis/metamodel/facetapi/FacetHolderImpl.java   |  168 ---
 .../apache/isis/metamodel/facetapi/FacetUtil.java  |   96 --
 .../metamodel/facetapi/FacetWithAttributes.java    |   32 -
 .../isis/metamodel/facetapi/FeatureType.java       |  159 ---
 .../isis/metamodel/facetapi/IdentifiedHolder.java  |   31 -
 .../isis/metamodel/facetapi/MetaModelRefiner.java  |   34 -
 .../isis/metamodel/facetapi/MethodRemover.java     |   71 --
 .../apache/isis/metamodel/facets/Annotations.java  |  695 ------------
 .../isis/metamodel/facets/CollectionUtils.java     |  129 ---
 .../facets/ContributeeMemberFacetFactory.java      |   45 -
 .../isis/metamodel/facets/DependentArgUtils.java   |  199 ----
 .../isis/metamodel/facets/DomainEventHelper.java   |  441 --------
 .../apache/isis/metamodel/facets/FacetFactory.java |  337 ------
 .../metamodel/facets/FacetFactoryAbstract.java     |   70 --
 .../isis/metamodel/facets/FacetedMethod.java       |  215 ----
 .../metamodel/facets/FacetedMethodParameter.java   |   50 -
 .../isis/metamodel/facets/ImperativeFacet.java     |  169 ---
 .../metamodel/facets/ImperativeFacetMulti.java     |   33 -
 .../facets/MethodFilteringFacetFactory.java        |   33 -
 .../isis/metamodel/facets/MethodFinderUtils.java   |  239 -----
 .../metamodel/facets/MethodLiteralConstants.java   |   77 --
 .../facets/MethodPrefixBasedFacetFactory.java      |   39 -
 .../MethodPrefixBasedFacetFactoryAbstract.java     |  138 ---
 .../metamodel/facets/MethodRemoverConstants.java   |   44 -
 .../isis/metamodel/facets/MultipleValueFacet.java  |   26 -
 .../metamodel/facets/ObjectSpecIdFacetFactory.java |   37 -
 .../facets/OrphanedSupportingMethodValidator.java  |  126 ---
 .../metamodel/facets/PostConstructMethodCache.java |   30 -
 ...ropertyOrCollectionIdentifyingFacetFactory.java |   83 --
 ...rCollectionIdentifyingFacetFactoryAbstract.java |   43 -
 .../metamodel/facets/SingleClassValueFacet.java    |   35 -
 .../facets/SingleClassValueFacetAbstract.java      |   60 --
 .../isis/metamodel/facets/SingleIntValueFacet.java |   27 -
 .../facets/SingleIntValueFacetAbstract.java        |   47 -
 .../metamodel/facets/SingleStringValueFacet.java   |   23 -
 .../facets/SingleStringValueFacetAbstract.java     |   58 -
 .../isis/metamodel/facets/SingleValueFacet.java    |   28 -
 .../metamodel/facets/SingleValueFacetAbstract.java |   46 -
 .../apache/isis/metamodel/facets/TypedHolder.java  |   55 -
 .../isis/metamodel/facets/TypedHolderDefault.java  |   58 -
 .../isis/metamodel/facets/WhereValueFacet.java     |   29 -
 .../metamodel/facets/WhereValueFacetAbstract.java  |   57 -
 ...lementSpecificationProviderFromTypeOfFacet.java |   37 -
 .../facets/actcoll/typeof/TypeOfFacet.java         |  126 ---
 .../facets/actcoll/typeof/TypeOfFacetAbstract.java |   40 -
 .../actcoll/typeof/TypeOfFacetDefaultToObject.java |   30 -
 .../typeof/TypeOfFacetInferredFromArray.java       |   30 -
 .../typeof/TypeOfFacetInferredFromGenerics.java    |   30 -
 .../action/ActionAnnotationFacetFactory.java       |  287 -----
 ...nChoicesForCollectionParameterFacetFactory.java |  161 ---
 .../action/associateWith/AssociatedWithFacet.java  |   30 -
 .../associateWith/AssociatedWithFacetAbstract.java |   45 -
 .../AssociatedWithFacetForActionAnnotation.java    |   32 -
 .../command/CommandFacetForActionAnnotation.java   |  123 ---
 ...ommandFacetForActionAnnotationAsConfigured.java |   39 -
 .../command/CommandFacetFromConfiguration.java     |   46 -
 .../hidden/HiddenFacetForActionAnnotation.java     |   56 -
 .../action/invocation/ActionDomainEventFacet.java  |   33 -
 .../invocation/ActionDomainEventFacetAbstract.java |  165 ---
 .../invocation/ActionDomainEventFacetDefault.java  |   33 -
 .../ActionDomainEventFacetForActionAnnotation.java |   32 -
 .../action/invocation/ActionInvocationFacet.java   |   51 -
 .../invocation/ActionInvocationFacetAbstract.java  |   38 -
 ...ctionInvocationFacetForDomainEventAbstract.java |  513 ---------
 ...ionFacetForDomainEventFromActionAnnotation.java |   40 -
 ...onInvocationFacetForDomainEventFromDefault.java |   40 -
 .../actions/action/invocation/CommandUtil.java     |  113 --
 .../PrototypeFacetForActionAnnotation.java         |   51 -
 .../PublishedActionFacetForActionAnnotation.java   |   99 --
 ...ActionFacetForActionAnnotationAsConfigured.java |   31 -
 .../PublishedActionFacetFromConfiguration.java     |   32 -
 ...ctionSemanticsFacetFallbackToNonIdempotent.java |   32 -
 .../ActionSemanticsFacetForActionAnnotation.java   |   49 -
 .../typeof/TypeOfFacetForActionAnnotation.java     |   33 -
 .../facets/actions/command/CommandFacet.java       |   55 -
 .../actions/command/CommandFacetAbstract.java      |  123 ---
 .../actions/defaults/ActionDefaultsFacet.java      |   35 -
 .../defaults/ActionDefaultsFacetAbstract.java      |   36 -
 .../method/ActionDefaultsFacetViaMethod.java       |   88 --
 .../ActionDefaultsFacetViaMethodFactory.java       |   88 --
 .../FileAcceptFacetForActionAnnotation.java        |   47 -
 .../facets/actions/homepage/HomePageFacet.java     |   34 -
 .../actions/homepage/HomePageFacetAbstract.java    |   36 -
 .../facets/actions/homepage/HomePageFacetImpl.java |   30 -
 .../annotation/HomePageFacetAnnotation.java        |   31 -
 .../annotation/HomePageFacetAnnotationFactory.java |  130 ---
 .../actions/layout/ActionLayoutFacetFactory.java   |  171 ---
 ...tionPositionFacetForActionLayoutAnnotation.java |   46 -
 .../layout/ActionPositionFacetForActionXml.java    |   41 -
 ...okmarkPolicyFacetForActionLayoutAnnotation.java |   58 -
 .../layout/BookmarkPolicyFacetForActionXml.java    |   42 -
 .../CssClassFaFacetForActionLayoutAnnotation.java  |   57 -
 .../layout/CssClassFaFacetForActionXml.java        |   44 -
 .../CssClassFacetForActionLayoutAnnotation.java    |   47 -
 .../actions/layout/CssClassFacetForActionXml.java  |   42 -
 .../DescribedAsFacetForActionLayoutAnnotation.java |   47 -
 .../layout/DescribedAsFacetForActionXml.java       |   42 -
 .../HiddenFacetForActionLayoutAnnotation.java      |   56 -
 .../actions/layout/HiddenFacetForActionXml.java    |   51 -
 .../NamedFacetForActionLayoutAnnotation.java       |   48 -
 .../actions/layout/NamedFacetForActionXml.java     |   44 -
 ...tContributedFacetForActionLayoutAnnotation.java |   52 -
 .../PromptStyleFacetForActionLayoutAnnotation.java |   97 --
 .../layout/PromptStyleFacetForActionXml.java       |   57 -
 .../RedirectFacetFromActionLayoutAnnotation.java   |   47 -
 .../actions/layout/RedirectFacetFromActionXml.java |   43 -
 .../notcontributed/NotContributedFacet.java        |   40 -
 .../NotContributedFacetAbstract.java               |   73 --
 ...tributedFacetDerivedFromDomainServiceFacet.java |   47 -
 ...dFacetDerivedFromDomainServiceFacetFactory.java |   58 -
 .../NotContributedFacetDerivedFromMixinFacet.java  |   37 -
 ...ntributedFacetDerivedFromMixinFacetFactory.java |   52 -
 .../notinservicemenu/NotInServiceMenuFacet.java    |   38 -
 .../NotInServiceMenuFacetAbstract.java             |   40 -
 ...viceMenuFacetDerivedFromDomainServiceFacet.java |   54 -
 ...uFacetDerivedFromDomainServiceFacetFactory.java |   59 --
 .../actions/position/ActionPositionFacet.java      |   44 -
 .../position/ActionPositionFacetAbstract.java      |   57 -
 .../position/ActionPositionFacetFallback.java      |   31 -
 .../facets/actions/prototype/PrototypeFacet.java   |   30 -
 .../actions/prototype/PrototypeFacetAbstract.java  |   56 -
 .../actions/publish/PublishedActionFacet.java      |   30 -
 .../publish/PublishedActionFacetAbstract.java      |   38 -
 .../facets/actions/redirect/RedirectFacet.java     |   33 -
 .../actions/redirect/RedirectFacetAbstract.java    |   66 --
 .../actions/redirect/RedirectFacetFallback.java    |   31 -
 .../actions/semantics/ActionSemanticsFacet.java    |   33 -
 .../semantics/ActionSemanticsFacetAbstract.java    |   39 -
 .../validate/ActionParameterValidationFacet.java   |   45 -
 .../ActionParameterValidationFacetAbstract.java    |   47 -
 .../actions/validate/ActionValidationFacet.java    |   49 -
 .../validate/ActionValidationFacetAbstract.java    |   47 -
 .../ActionParameterValidationFacetViaMethod.java   |   84 --
 .../method/ActionValidationFacetViaMethod.java     |   84 --
 .../ActionValidationFacetViaMethodFactory.java     |  117 --
 .../facets/all/deficiencies/DeficiencyFacet.java   |  134 ---
 .../facets/all/describedas/DescribedAsFacet.java   |   33 -
 .../all/describedas/DescribedAsFacetAbstract.java  |   36 -
 .../isis/metamodel/facets/all/help/HelpFacet.java  |   29 -
 .../facets/all/help/HelpFacetAbstract.java         |   36 -
 .../metamodel/facets/all/hide/HiddenFacet.java     |   31 -
 .../all/i18n/DescribedAsFacetTranslated.java       |   64 --
 .../facets/all/i18n/NamedFacetTranslated.java      |   72 --
 .../facets/all/i18n/PluralFacetTranslated.java     |   55 -
 .../facets/all/i18n/TranslationFacetFactory.java   |  119 ---
 .../metamodel/facets/all/named/NamedFacet.java     |   42 -
 .../facets/all/named/NamedFacetAbstract.java       |   59 --
 .../facets/all/named/NamedFacetInferred.java       |   31 -
 .../collections/CollectionFacetAbstract.java       |   40 -
 .../CollectionAccessorFacetViaAccessor.java        |  109 --
 .../CollectionAccessorFacetViaAccessorFactory.java |  112 --
 .../clear/CollectionClearFacetFactory.java         |   70 --
 .../clear/CollectionClearFacetViaAccessor.java     |   79 --
 .../clear/CollectionClearFacetViaClearMethod.java  |   70 --
 .../CollectionAnnotationFacetFactory.java          |  293 -----
 .../collection/defaultview/DefaultViewFacet.java   |   26 -
 .../defaultview/DefaultViewFacetAbstract.java      |   35 -
 .../DisabledFacetForCollectionAnnotation.java      |   69 --
 .../hidden/HiddenFacetForCollectionAnnotation.java |   56 -
 ...ectionAddToFacetForDomainEventFromAbstract.java |  124 ---
 ...acetForDomainEventFromCollectionAnnotation.java |   43 -
 ...lectionAddToFacetForDomainEventFromDefault.java |   41 -
 .../modify/CollectionDomainEventFacet.java         |   34 -
 .../modify/CollectionDomainEventFacetAbstract.java |  145 ---
 .../modify/CollectionDomainEventFacetDefault.java  |   32 -
 ...ionDomainEventFacetForCollectionAnnotation.java |   45 -
 ...nRemoveFromFacetForDomainEventFromAbstract.java |  123 ---
 ...acetForDomainEventFromCollectionAnnotation.java |   43 -
 ...onRemoveFromFacetForDomainEventFromDefault.java |   41 -
 .../NotPersistedFacetForCollectionAnnotation.java  |   55 -
 ...fFacetOnCollectionFromCollectionAnnotation.java |   47 -
 ...abledFacetOnCollectionDerivedFromImmutable.java |   39 -
 ...cetOnCollectionDerivedFromImmutableFactory.java |   45 -
 .../javautilcollection/CollectionFacetFactory.java |   86 --
 .../javautilcollection/JavaArrayFacet.java         |   84 --
 .../javautilcollection/JavaCollectionFacet.java    |   78 --
 .../layout/CollectionLayoutFacetFactory.java       |  123 ---
 ...CssClassFacetForCollectionLayoutAnnotation.java |   45 -
 .../layout/CssClassFacetForCollectionXml.java      |   42 -
 ...aultViewFacetForCollectionLayoutAnnotation.java |   48 -
 .../layout/DefaultViewFacetForCollectionXml.java   |   42 -
 ...cribedAsFacetForCollectionLayoutAnnotation.java |   45 -
 .../layout/DescribedAsFacetForCollectionXml.java   |   42 -
 .../HiddenFacetForCollectionLayoutAnnotation.java  |   58 -
 .../layout/HiddenFacetForCollectionXml.java        |   51 -
 .../NamedFacetForCollectionLayoutAnnotation.java   |   52 -
 .../layout/NamedFacetForCollectionXml.java         |   47 -
 .../PagedFacetForCollectionLayoutAnnotation.java   |   46 -
 .../layout/PagedFacetForCollectionXml.java         |   41 -
 ...SortedByFacetForCollectionLayoutAnnotation.java |   53 -
 .../layout/SortedByFacetForCollectionXml.java      |   56 -
 .../collections/modify/CollectionAddToFacet.java   |   37 -
 .../modify/CollectionAddToFacetAbstract.java       |   36 -
 .../modify/CollectionAddToFacetViaAccessor.java    |   77 --
 .../modify/CollectionAddToFacetViaMethod.java      |   74 --
 ...tionAddToRemoveFromAndValidateFacetFactory.java |  177 ----
 .../collections/modify/CollectionClearFacet.java   |   36 -
 .../modify/CollectionClearFacetAbstract.java       |   36 -
 .../facets/collections/modify/CollectionFacet.java |  112 --
 .../modify/CollectionRemoveFromFacet.java          |   39 -
 .../modify/CollectionRemoveFromFacetAbstract.java  |   36 -
 .../CollectionRemoveFromFacetViaAccessor.java      |   80 --
 .../modify/CollectionRemoveFromFacetViaMethod.java |   74 --
 .../TypeOfFacetInferredFromSupportingMethods.java  |   31 -
 .../parented/ParentedCollectionFacetDefault.java   |   37 -
 .../ParentedFacetSinceCollectionFactory.java       |   53 -
 .../facets/collections/sortedby/SortedByFacet.java |   32 -
 .../sortedby/SortedByFacetAbstract.java            |   38 -
 .../annotation/SortedByFacetAnnotationFactory.java |   91 --
 .../validate/CollectionValidateAddToFacet.java     |   40 -
 .../CollectionValidateAddToFacetAbstract.java      |   48 -
 .../CollectionValidateAddToFacetViaMethod.java     |   82 --
 .../CollectionValidateRemoveFromFacet.java         |   39 -
 .../CollectionValidateRemoveFromFacetAbstract.java |   47 -
 ...CollectionValidateRemoveFromFacetViaMethod.java |   83 --
 .../collparam/semantics/CollectionSemantics.java   |  125 ---
 .../semantics/CollectionSemanticsFacet.java        |   29 -
 .../semantics/CollectionSemanticsFacetDefault.java |   47 -
 .../facets/fallback/ActionChoicesFacetNone.java    |   45 -
 .../facets/fallback/ActionDefaultsFacetNone.java   |   42 -
 .../facets/fallback/DescribedAsFacetNone.java      |   39 -
 .../facets/fallback/FallbackFacetFactory.java      |  144 ---
 .../metamodel/facets/fallback/HelpFacetNone.java   |   44 -
 .../LabelAtFacetFromLayoutConfiguration.java       |   30 -
 .../facets/fallback/MaxLengthFacetUnlimited.java   |   46 -
 .../facets/fallback/MultiLineFacetNone.java        |   36 -
 .../facets/fallback/NamedFacetDefault.java         |   33 -
 .../metamodel/facets/fallback/NamedFacetNone.java  |   44 -
 .../fallback/PagedFacetFromConfiguration.java      |   29 -
 .../metamodel/facets/fallback/TitleFacetNone.java  |   42 -
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  399 -------
 .../facets/jaxb/XmlAccessorTypeFacet.java          |   31 -
 .../facets/jaxb/XmlAccessorTypeFacetAbstract.java  |   40 -
 .../facets/jaxb/XmlAccessorTypeFacetDefault.java   |   33 -
 .../facets/jaxb/XmlJavaTypeAdapterFacet.java       |   29 -
 .../jaxb/XmlJavaTypeAdapterFacetAbstract.java      |   38 -
 .../jaxb/XmlJavaTypeAdapterFacetDefault.java       |   31 -
 .../metamodel/facets/jaxb/XmlTransientFacet.java   |   29 -
 .../facets/jaxb/XmlTransientFacetAbstract.java     |   37 -
 .../facets/jaxb/XmlTransientFacetDefault.java      |   30 -
 .../facets/members/cssclass/CssClassFacet.java     |   37 -
 .../members/cssclass/CssClassFacetAbstract.java    |   51 -
 .../members/cssclass/CssClassFacetAbstract2.java   |   36 -
 .../CssClassFacetOnActionFromConfiguredRegex.java  |   30 -
 ...assFacetOnActionFromConfiguredRegexFactory.java |  120 ---
 .../facets/members/cssclassfa/CssClassFaFacet.java |   37 -
 .../cssclassfa/CssClassFaFacetAbstract.java        |   79 --
 .../members/cssclassfa/CssClassFaPosition.java     |  104 --
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |  103 --
 ...CssClassFaFacetOnMemberFromConfiguredRegex.java |   31 -
 .../CssClassFaFacetOnMemberFromProperties.java     |   40 -
 .../cssclassfa/annotprop/MixinInterceptor.java     |   64 --
 .../DescribedAsFacetOnMemberDerivedFromType.java   |   32 -
 .../annotprop/DescribedAsFacetOnMemberFactory.java |   64 --
 .../DescribedAsFacetOnMemberFromProperties.java    |   37 -
 .../facets/members/disabled/DisabledFacet.java     |   54 -
 .../members/disabled/DisabledFacetAbstract.java    |  102 --
 .../DisabledFacetAbstractAlwaysEverywhere.java     |   40 -
 .../disabled/DisabledFacetAbstractImpl.java        |   83 --
 .../disabled/DisabledFacetForContributee.java      |   30 -
 .../disabled/method/DisableForContextFacet.java    |   37 -
 .../method/DisableForContextFacetAbstract.java     |   37 -
 .../method/DisableForContextFacetNone.java         |   49 -
 .../method/DisableForContextFacetViaMethod.java    |  100 --
 .../DisableForContextFacetViaMethodFactory.java    |   94 --
 .../facets/members/hidden/HiddenFacetAbstract.java |   84 --
 .../HiddenFacetAbstractAlwaysEverywhere.java       |   50 -
 .../members/hidden/HiddenFacetAbstractImpl.java    |   52 -
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   53 -
 .../members/hidden/method/HideForContextFacet.java |   37 -
 .../hidden/method/HideForContextFacetAbstract.java |   37 -
 .../hidden/method/HideForContextFacetNone.java     |   45 -
 .../method/HideForContextFacetViaMethod.java       |   78 --
 .../HideForContextFacetViaMethodFactory.java       |   82 --
 .../facets/members/order/MemberOrderFacet.java     |   59 --
 .../members/order/MemberOrderFacetAbstract.java    |  107 --
 .../annotprop/MemberOrderFacetAnnotation.java      |   35 -
 .../order/annotprop/MemberOrderFacetFactory.java   |   69 --
 .../MemberOrderFacetForActionAnnotation.java       |   34 -
 .../annotprop/MemberOrderFacetProperties.java      |   49 -
 .../order/annotprop/MemberOrderFacetXml.java       |   35 -
 .../ViewModelSemanticCheckingFacetFactory.java     |  209 ----
 .../facets/object/audit/AuditableFacet.java        |   40 -
 .../object/audit/AuditableFacetAbstract.java       |   61 --
 .../facets/object/audit/AuditableFacetImpl.java    |   30 -
 .../object/autocomplete/AutoCompleteFacet.java     |   35 -
 .../autocomplete/AutoCompleteFacetAbstract.java    |  126 ---
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |   31 -
 .../BookmarkPolicyFacetAbstract.java               |   59 --
 .../BookmarkPolicyFacetFallback.java               |   32 -
 .../BookmarkPolicyFacetFallbackFactory.java        |   88 --
 .../facets/object/callbacks/CallbackFacet.java     |   53 -
 .../object/callbacks/CallbackFacetAbstract.java    |   35 -
 .../object/callbacks/CreatedCallbackFacet.java     |   36 -
 .../callbacks/CreatedCallbackFacetAbstract.java    |   35 -
 .../callbacks/CreatedCallbackFacetFactory.java     |   51 -
 .../callbacks/CreatedCallbackFacetViaMethod.java   |   70 --
 .../callbacks/CreatedLifecycleEventFacet.java      |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   46 -
 .../object/callbacks/LifecycleEventFacet.java      |   28 -
 .../object/callbacks/LoadCallbackFacetFactory.java |   65 --
 .../object/callbacks/LoadedCallbackFacet.java      |   37 -
 .../callbacks/LoadedCallbackFacetAbstract.java     |   35 -
 .../callbacks/LoadedCallbackFacetViaMethod.java    |   71 --
 .../callbacks/LoadedLifecycleEventFacet.java       |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 -
 .../object/callbacks/LoadingCallbackFacet.java     |   28 -
 .../callbacks/LoadingCallbackFacetAbstract.java    |   39 -
 .../callbacks/LoadingCallbackFacetViaMethod.java   |   75 --
 .../callbacks/PersistCallbackFacetFactory.java     |   78 --
 .../PersistCallbackViaSaveMethodFacetFactory.java  |   78 --
 .../object/callbacks/PersistedCallbackFacet.java   |   36 -
 .../callbacks/PersistedCallbackFacetAbstract.java  |   35 -
 .../callbacks/PersistedCallbackFacetViaMethod.java |   71 --
 .../callbacks/PersistedLifecycleEventFacet.java    |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   44 -
 .../object/callbacks/PersistingCallbackFacet.java  |   37 -
 .../callbacks/PersistingCallbackFacetAbstract.java |   35 -
 .../PersistingCallbackFacetViaMethod.java          |   71 --
 .../callbacks/PersistingLifecycleEventFacet.java   |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../callbacks/RemoveCallbackFacetFactory.java      |   81 --
 .../RemoveCallbackViaDeleteMethodFacetFactory.java |   81 --
 .../object/callbacks/RemovedCallbackFacet.java     |   35 -
 .../callbacks/RemovedCallbackFacetAbstract.java    |   39 -
 .../callbacks/RemovedCallbackFacetViaMethod.java   |   75 --
 .../object/callbacks/RemovingCallbackFacet.java    |   34 -
 .../callbacks/RemovingCallbackFacetAbstract.java   |   35 -
 .../callbacks/RemovingCallbackFacetViaMethod.java  |   71 --
 .../callbacks/RemovingLifecycleEventFacet.java     |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../callbacks/UpdateCallbackFacetFactory.java      |   68 --
 .../object/callbacks/UpdatedCallbackFacet.java     |   37 -
 .../callbacks/UpdatedCallbackFacetAbstract.java    |   35 -
 .../callbacks/UpdatedCallbackFacetViaMethod.java   |   71 --
 .../callbacks/UpdatedLifecycleEventFacet.java      |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../object/callbacks/UpdatingCallbackFacet.java    |   37 -
 .../callbacks/UpdatingCallbackFacetAbstract.java   |   35 -
 .../callbacks/UpdatingCallbackFacetViaMethod.java  |   71 --
 .../callbacks/UpdatingLifecycleEventFacet.java     |   30 -
 ...fecycleEventFacetForDomainObjectAnnotation.java |   45 -
 .../choices/ChoicesFacetFromBoundedAbstract.java   |  119 ---
 .../facets/object/choices/ChoicesFacetUtils.java   |   42 -
 .../facets/object/choices/QueryFindAllChoices.java |   57 -
 .../object/choices/enums/ChoicesFacetEnum.java     |   49 -
 .../facets/object/choices/enums/EnumFacet.java     |   26 -
 ...ingValueFacetUsingSemanticsProviderFactory.java |   49 -
 .../choices/enums/EnumValueSemanticsProvider.java  |  152 ---
 .../cssclass/method/CssClassFacetMethod.java       |   61 --
 .../method/CssClassFacetMethodFactory.java         |   52 -
 ...ssClassFaFacetForDomainObjectLayoutFactory.java |   43 -
 .../CssClassFaFacetForViewModelLayoutFactory.java  |   45 -
 .../facets/object/defaults/DefaultedFacet.java     |   47 -
 .../object/defaults/DefaultedFacetAbstract.java    |   84 --
 .../DefaultedFacetUsingDefaultsProvider.java       |   47 -
 .../object/defaults/DefaultsProviderUtil.java      |   75 --
 .../annotcfg/DefaultedFacetAnnotation.java         |   62 --
 ...tedFacetAnnotationElseConfigurationFactory.java |   71 --
 .../annotcfg/DefaultedFacetFromConfiguration.java  |   31 -
 .../object/disabled/DisabledObjectFacet.java       |   54 -
 .../disabled/DisabledObjectFacetAbstract.java      |   52 -
 .../method/DisabledObjectFacetViaMethod.java       |   93 --
 .../DisabledObjectFacetViaMethodFactory.java       |   88 --
 .../DomainObjectAnnotationFacetFactory.java        |  570 ----------
 .../AuditableFacetForDomainObjectAnnotation.java   |   74 --
 ...FacetForDomainObjectAnnotationAsConfigured.java |   31 -
 .../auditing/AuditableFacetFromConfiguration.java  |   36 -
 ...AutoCompleteFacetForDomainObjectAnnotation.java |   46 -
 .../ChoicesFacetForDomainObjectAnnotation.java     |   49 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   52 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 -
 ...EventDefaultFacetForDomainObjectAnnotation.java |   51 -
 .../ImmutableFacetForDomainObjectAnnotation.java   |  101 --
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 -
 .../editing/ImmutableFacetFromConfiguration.java   |   58 -
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |   47 -
 ...lishedObjectFacetForDomainObjectAnnotation.java |   67 --
 ...FacetForDomainObjectAnnotationAsConfigured.java |   30 -
 .../PublishedObjectFacetFromConfiguration.java     |   31 -
 ...atableObjectFacetForDomainObjectAnnotation.java |   73 --
 ...PolicyFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../BookmarkPolicyFacetForDomainObjectXml.java     |   42 -
 ...arkPolicyFacetForViewModelLayoutAnnotation.java |   47 -
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |   55 -
 .../CssClassFaFacetForDomainObjectXml.java         |   44 -
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |   54 -
 ...sClassFacetForDomainObjectLayoutAnnotation.java |   57 -
 .../CssClassFacetForDomainObjectXml.java           |   42 -
 .../CssClassFacetForViewModelLayoutAnnotation.java |   45 -
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  121 ---
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  118 ---
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../DescribedAsFacetForDomainObjectXml.java        |   42 -
 ...scribedAsFacetForViewModelLayoutAnnotation.java |   47 -
 .../DomainObjectLayoutFacetFactory.java            |  113 --
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  117 --
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  118 ---
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |  118 ---
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |  117 --
 .../NamedFacetForDomainObjectLayoutAnnotation.java |   47 -
 .../NamedFacetForDomainObjectXml.java              |   44 -
 .../NamedFacetForViewModelLayoutAnnotation.java    |   45 -
 .../PagedFacetForDomainObjectLayoutAnnotation.java |   46 -
 .../PagedFacetForViewModelLayoutAnnotation.java    |   46 -
 ...PluralFacetForDomainObjectLayoutAnnotation.java |   47 -
 .../PluralFacetForDomainObjectXml.java             |   40 -
 .../PluralFacetForViewModelLayoutAnnotation.java   |   47 -
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  135 ---
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  135 ---
 .../object/domainservice/DomainServiceFacet.java   |   52 -
 .../domainservice/DomainServiceFacetAbstract.java  |   65 --
 .../annotation/DomainServiceFacetAnnotation.java   |   35 -
 .../DomainServiceFacetAnnotationFactory.java       |  153 ---
 ...conFacetDerivedFromDomainServiceAnnotation.java |   47 -
 .../DomainServiceLayoutFacet.java                  |   36 -
 .../DomainServiceLayoutFacetAbstract.java          |   54 -
 .../DomainServiceLayoutFacetFactory.java           |   70 --
 ...NamedFacetForDomainServiceLayoutAnnotation.java |   36 -
 .../DomainServiceLayoutFacetAnnotation.java        |   34 -
 .../facets/object/encodeable/EncodableFacet.java   |   42 -
 .../object/encodeable/EncodableFacetAbstract.java  |   85 --
 .../object/encodeable/EncoderDecoderUtil.java      |   36 -
 .../annotcfg/EncodableFacetFromConfiguration.java  |   33 -
 .../encoder/EncodableFacetUsingEncoderDecoder.java |   75 --
 .../facets/object/entity/EntityFacet.java          |   54 -
 .../facets/object/facets/FacetsFacet.java          |   48 -
 .../facets/object/facets/FacetsFacetAbstract.java  |   94 --
 .../facets/annotation/FacetsFacetAnnotation.java   |   32 -
 .../annotation/FacetsFacetAnnotationFactory.java   |   54 -
 .../metamodel/facets/object/grid/GridFacet.java    |   41 -
 .../facets/object/grid/GridFacetDefault.java       |   84 --
 .../facets/object/grid/GridFacetFactory.java       |   46 -
 .../facets/object/hidden/HiddenObjectFacet.java    |   55 -
 .../object/hidden/HiddenObjectFacetAbstract.java   |   50 -
 .../hidden/method/HiddenObjectFacetViaMethod.java  |   65 --
 .../method/HiddenObjectFacetViaMethodFactory.java  |   90 --
 .../metamodel/facets/object/icon/IconFacet.java    |   44 -
 .../facets/object/icon/IconFacetAbstract.java      |   36 -
 .../facets/object/icon/method/IconFacetMethod.java |   52 -
 .../object/icon/method/IconFacetMethodFactory.java |   53 -
 .../RemoveAnnotatedMethodsFacetFactory.java        |   99 --
 ...oveDatanucleusPersistableTypesFacetFactory.java |   67 --
 .../RemoveDnPrefixedMethodsFacetFactory.java       |   46 -
 .../javalang/IteratorFilteringFacetFactory.java    |   55 -
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  132 ---
 .../jdo/RemoveJdoEnhancementTypesFacetFactory.java |   66 --
 .../jdo/RemoveJdoPrefixedMethodsFacetFactory.java  |   48 -
 .../facets/object/immutable/ImmutableFacet.java    |   69 --
 .../object/immutable/ImmutableFacetAbstract.java   |   60 --
 .../CopyImmutableFacetOntoMembersFactory.java      |   45 -
 .../facets/object/layout/LayoutFacet.java          |   37 -
 .../facets/object/layout/LayoutFacetAbstract.java  |   41 -
 .../facets/object/layout/LayoutFacetFactory.java   |   56 -
 .../facets/object/layout/LayoutFacetFallback.java  |   43 -
 .../facets/object/layout/LayoutFacetMethod.java    |   54 -
 .../mixin/MetaModelValidatorForMixinTypes.java     |   55 -
 .../metamodel/facets/object/mixin/MixinFacet.java  |   74 --
 .../facets/object/mixin/MixinFacetAbstract.java    |  143 ---
 .../mixin/MixinFacetForDomainObjectAnnotation.java |   72 --
 .../object/mixin/MixinFacetForMixinAnnotation.java |   64 --
 .../mixin/MixinFacetForMixinAnnotationFactory.java |   64 --
 .../object/navparent/NavigableParentFacet.java     |   43 -
 .../navparent/NavigableParentFacetAbstract.java    |   36 -
 .../NavigableParentAnnotationFacetFactory.java     |  161 ---
 .../method/NavigableParentFacetMethod.java         |   60 --
 .../object/objectspecid/ObjectSpecIdFacet.java     |   33 -
 .../objectspecid/ObjectSpecIdFacetAbstract.java    |   66 --
 .../ObjectSpecIdFacetDerivedFromClassName.java     |   35 -
 ...jectSpecIdFacetDerivedFromClassNameFactory.java |  205 ----
 ...ectSpecIdFacetDerivedFromIoCNamingStrategy.java |   34 -
 .../ObjectSpecIdFacetOnStandaloneList.java         |   31 -
 .../ObjectValidPropertiesFacet.java                |   42 -
 .../ObjectValidPropertiesFacetAbstract.java        |   48 -
 .../impl/ObjectValidPropertiesFacetImpl.java       |   70 --
 .../ObjectValidPropertiesFacetImplFactory.java     |   35 -
 .../metamodel/facets/object/paged/PagedFacet.java  |   31 -
 .../facets/object/paged/PagedFacetAbstract.java    |   50 -
 .../PagedFacetForPagedAnnotationOnType.java        |   34 -
 .../object/parented/ParentedCollectionFacet.java   |   40 -
 .../parented/ParentedCollectionFacetAbstract.java  |   36 -
 .../object/parseable/InvalidEntryException.java    |   42 -
 .../facets/object/parseable/ParseableFacet.java    |   55 -
 .../object/parseable/ParseableFacetAbstract.java   |   90 --
 .../facets/object/parseable/ParserUtil.java        |   46 -
 .../object/parseable/TextEntryParseException.java  |   47 -
 .../annotcfg/ParseableFacetFromConfiguration.java  |   33 -
 .../parser/ParseableFacetUsingParser.java          |  132 ---
 .../facets/object/plural/PluralFacet.java          |   41 -
 .../facets/object/plural/PluralFacetAbstract.java  |   41 -
 .../plural/inferred/PluralFacetInferred.java       |   31 -
 .../facets/object/projection/ProjectionFacet.java  |   29 -
 .../object/projection/ProjectionFacetAbstract.java |   42 -
 .../ProjectionFacetFromProjectingProperty.java     |   65 --
 .../CssClassFacetDerivedFromProjectionFacet.java   |   54 -
 .../ident/IconFacetDerivedFromProjectionFacet.java |   52 -
 .../TitleFacetDerivedFromProjectionFacet.java      |   52 -
 .../object/promptStyle/PromptStyleFacet.java       |   33 -
 .../promptStyle/PromptStyleFacetAbstract.java      |   42 -
 .../promptStyle/PromptStyleFacetAsConfigured.java  |   45 -
 .../PromptStyleFacetFallBackToInline.java          |   37 -
 .../publishedobject/PublishedObjectFacet.java      |   30 -
 .../PublishedObjectFacetAbstract.java              |   38 -
 ...etOnCollectionDerivedFromRecreatableObject.java |   46 -
 ...CollectionDerivedFromViewModelFacetFactory.java |   54 -
 ...acetOnPropertyDerivedFromRecreatableObject.java |   48 -
 ...tyDerivedFromRecreatableObjectFacetFactory.java |   52 -
 .../RecreatableObjectFacetAbstract.java            |  129 ---
 ...ObjectFacetDeclarativeInitializingAbstract.java |  145 ---
 .../recreatable/RecreatableObjectFacetFactory.java |  131 ---
 ...ctFacetForRecreatableDomainObjectInterface.java |   46 -
 ...eObjectFacetForRecreatableObjectAnnotation.java |   34 -
 ...leObjectFacetForRecreatableObjectInterface.java |   45 -
 ...creatableObjectFacetForViewModelAnnotation.java |   35 -
 ...ableObjectFacetForXmlRootElementAnnotation.java |   81 --
 .../metamodel/facets/object/recreatable/Util.java  |   33 -
 .../metamodel/facets/object/title/TitleFacet.java  |   55 -
 .../facets/object/title/TitleFacetAbstract.java    |   45 -
 .../annotation/TitleAnnotationFacetFactory.java    |  187 ----
 .../annotation/TitleFacetViaTitleAnnotation.java   |  169 ---
 .../title/methods/TitleFacetViaMethodsFactory.java |   95 --
 .../title/methods/TitleFacetViaTitleMethod.java    |   93 --
 .../title/methods/TitleFacetViaToStringMethod.java |   70 --
 .../object/title/parser/TitleFacetUsingParser.java |   79 --
 .../validateobject/ValidateObjectFacet.java        |   55 -
 .../ValidateObjectFacetAbstract.java               |   49 -
 .../method/ValidateObjectFacetMethod.java          |   80 --
 .../method/ValidateObjectFacetMethodFactory.java   |   61 --
 .../facets/object/value/EqualByContentFacet.java   |   33 -
 .../object/value/EqualByContentFacetAbstract.java  |   36 -
 .../EqualByContentFacetViaValueSemantics.java      |   30 -
 .../value/ImmutableFacetViaValueSemantics.java     |   39 -
 .../object/value/MaxLengthFacetUsingParser.java    |   58 -
 .../value/TypicalLengthFacetUsingParser.java       |   53 -
 .../metamodel/facets/object/value/ValueFacet.java  |   35 -
 .../facets/object/value/ValueFacetAbstract.java    |  155 ---
 .../facets/object/value/ValueFacetSimple.java      |   37 -
 .../value/annotcfg/ValueFacetAnnotation.java       |   81 --
 ...ValueFacetAnnotationOrConfigurationFactory.java |  113 --
 .../annotcfg/ValueFacetFromConfiguration.java      |   38 -
 .../vsp/ValueFacetUsingSemanticsProvider.java      |   41 -
 .../ValueFacetUsingSemanticsProviderFactory.java   |   46 -
 .../ValueSemanticsProviderAndFacetAbstract.java    |  328 ------
 .../value/vsp/ValueSemanticsProviderUtil.java      |   67 --
 .../facets/object/viewmodel/ViewModelFacet.java    |  125 ---
 .../facets/object/wizard/WizardFacet.java          |   41 -
 .../facets/object/wizard/WizardFacetAbstract.java  |   36 -
 .../facets/objectvalue/choices/ChoicesFacet.java   |   49 -
 .../objectvalue/choices/ChoicesFacetAbstract.java  |   36 -
 .../objectvalue/fileaccept/FileAcceptFacet.java    |   35 -
 .../fileaccept/FileAcceptFacetAbstract.java        |   37 -
 .../facets/objectvalue/labelat/LabelAtFacet.java   |   36 -
 .../objectvalue/labelat/LabelAtFacetAbstract.java  |   56 -
 .../LabelAtFacetInferredFromMultiLineFacet.java    |   38 -
 .../objectvalue/mandatory/MandatoryFacet.java      |   57 -
 .../mandatory/MandatoryFacetAbstract.java          |  110 --
 .../mandatory/MandatoryFacetDefault.java           |   43 -
 .../facets/objectvalue/maxlen/MaxLengthFacet.java  |   41 -
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |   75 --
 .../objectvalue/multiline/MultiLineFacet.java      |   51 -
 .../multiline/MultiLineFacetAbstract.java          |   63 --
 .../MustSatisfySpecificationFacet.java             |   27 -
 .../MustSatisfySpecificationFacetAbstract.java     |  124 ---
 .../mustsatisfyspec/SpecificationEvaluator.java    |   80 --
 .../facets/objectvalue/regex/RegExFacet.java       |   38 -
 .../objectvalue/regex/RegExFacetAbstract.java      |  104 --
 .../renderedadjusted/RenderedAdjustedFacet.java    |   39 -
 .../RenderedAdjustedFacetAbstract.java             |   56 -
 .../objectvalue/typicallen/TypicalLengthFacet.java |   40 -
 .../typicallen/TypicalLengthFacetAbstract.java     |   45 -
 .../ActionParameterAutoCompleteFacet.java          |   47 -
 .../ActionParameterAutoCompleteFacetAbstract.java  |   41 -
 .../facets/param/autocomplete/MinLengthUtil.java   |   56 -
 .../ActionParameterAutoCompleteFacetViaMethod.java |  121 ---
 ...ParameterAutoCompleteFacetViaMethodFactory.java |   88 --
 ...ameterFromJavaxValidationAnnotationFactory.java |   56 -
 ...rameterFromJavaxValidationDigitsAnnotation.java |   59 --
 .../facets/param/choices/ActionChoicesFacet.java   |   38 -
 .../param/choices/ActionChoicesFacetAbstract.java  |   36 -
 .../param/choices/ActionParameterChoicesFacet.java |   42 -
 .../ActionParameterChoicesFacetAbstract.java       |   38 -
 .../choices/ActionParameterChoicesFacetNone.java   |   48 -
 ...rameterChoicesFacetDerivedFromChoicesFacet.java |   55 -
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   55 -
 .../method/ActionChoicesFacetViaMethod.java        |  121 ---
 .../method/ActionChoicesFacetViaMethodFactory.java |  100 --
 .../ActionParameterChoicesFacetViaMethod.java      |  108 --
 ...ctionParameterChoicesFacetViaMethodFactory.java |   99 --
 .../defaults/ActionParameterDefaultsFacet.java     |   41 -
 .../ActionParameterDefaultsFacetAbstract.java      |   36 -
 ...ParameterDefaultFacetDerivedFromTypeFacets.java |   60 --
 ...arameterDefaultFacetDerivedFromTypeFactory.java |   64 --
 .../ActionParameterDefaultsFacetViaMethod.java     |  117 --
 ...tionParameterDefaultsFacetViaMethodFactory.java |  134 ---
 ...ameterAnnotationElseDerivedFromTypeFactory.java |   55 -
 ...DescribedAsFacetOnParameterDerivedFromType.java |   32 -
 .../disable/ActionParameterDisabledFacet.java      |   41 -
 .../ActionParameterDisabledFacetAbstract.java      |   49 -
 .../ActionParameterDisabledFacetViaMethod.java     |   95 --
 ...tionParameterDisabledFacetViaMethodFactory.java |   94 --
 .../param/hide/ActionParameterHiddenFacet.java     |   42 -
 .../hide/ActionParameterHiddenFacetAbstract.java   |   55 -
 .../ActionParameterHiddenFacetViaMethod.java       |   82 --
 ...ActionParameterHiddenFacetViaMethodFactory.java |   91 --
 .../CssClassFacetForParameterLayoutAnnotation.java |   46 -
 ...scribedAsFacetForParameterLayoutAnnotation.java |   46 -
 .../LabelAtFacetForParameterLayoutAnnotation.java  |   47 -
 ...MultiLineFacetForParameterLayoutAnnotation.java |   45 -
 .../NamedFacetForParameterLayoutAnnotation.java    |   51 -
 .../param/layout/ParameterLayoutFacetFactory.java  |   58 -
 ...dAdjustedFacetForParameterLayoutAnnotation.java |   58 -
 ...calLengthFacetForParameterLayoutAnnotation.java |   60 --
 .../MandatoryFacetOnParametersDefaultFactory.java  |   56 -
 .../NamedFacetForParameterUsingReflection.java     |   34 -
 .../ParameterNameFacetFactoryUsingReflection.java  |   74 --
 .../parameter/ParameterAnnotationFacetFactory.java |  134 ---
 .../FileAcceptFacetForParameterAnnotation.java     |   47 -
 .../MandatoryFacetForParameterAnnotation.java      |   81 --
 ...cetInvertedByNullableAnnotationOnParameter.java |   59 --
 .../MaxLengthFacetForParameterAnnotation.java      |   46 -
 ...fySpecificationFacetForParameterAnnotation.java |   69 --
 .../regex/RegExFacetForParameterAnnotation.java    |   72 --
 .../RegExFacetForPatternAnnotationOnParameter.java |   66 --
 .../TypicalLengthFacetOnParameterAnnotation.java   |   50 -
 ...picalLengthFacetOnParameterDerivedFromType.java |   49 -
 ...acetOnParameterDerivedFromTypeFacetFactory.java |   56 -
 .../validate/ActionParameterValidationFacet.java   |   45 -
 .../ActionParameterValidationFacetAbstract.java    |   47 -
 .../ActionParameterValidationFacetViaMethod.java   |   84 --
 ...onParameterValidationFacetViaMethodFactory.java |   82 --
 .../PropertyOrCollectionAccessorFacet.java         |   53 -
 .../PropertyOrCollectionAccessorFacetAbstract.java |   57 -
 .../propcoll/notpersisted/NotPersistedFacet.java   |   38 -
 .../notpersisted/NotPersistedFacetAbstract.java    |   36 -
 .../accessor/PropertyAccessorFacetViaAccessor.java |   96 --
 .../PropertyAccessorFacetViaAccessorFactory.java   |  113 --
 .../autocomplete/PropertyAutoCompleteFacet.java    |   51 -
 .../PropertyAutoCompleteFacetAbstract.java         |   39 -
 .../method/PropertyAutoCompleteFacetMethod.java    |  114 --
 .../PropertyAutoCompleteFacetMethodFactory.java    |   79 --
 ...ropertyFromJavaxValidationDigitsAnnotation.java |   60 --
 ...FromJavaxValidationDigitsAnnotationFactory.java |   59 --
 .../properties/businesskey/BusinessKeyFacet.java   |   36 -
 .../businesskey/BusinessKeyFacetAbstract.java      |   36 -
 .../properties/choices/PropertyChoicesFacet.java   |   50 -
 .../choices/PropertyChoicesFacetAbstract.java      |   36 -
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |   52 -
 ...ChoicesFacetDerivedFromChoicesFacetFactory.java |   45 -
 .../method/PropertyChoicesFacetViaMethod.java      |   93 --
 .../PropertyChoicesFacetViaMethodFactory.java      |   77 --
 .../properties/defaults/PropertyDefaultFacet.java  |   46 -
 .../defaults/PropertyDefaultFacetAbstract.java     |   36 -
 .../defaults/PropertyDefaultFacetNone.java         |   44 -
 ...pertyDefaultFacetDerivedFromDefaultedFacet.java |   57 -
 ...PropertyDefaultFacetDerivedFromTypeFactory.java |   64 --
 .../method/PropertyDefaultFacetViaMethod.java      |   88 --
 .../PropertyDefaultFacetViaMethodFactory.java      |   77 --
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   38 -
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   52 -
 .../inferred/DisabledFacetOnPropertyInferred.java  |   32 -
 .../DisabledFacetOnPropertyInferredFactory.java    |   56 -
 .../MandatoryFacetOnProperyDefaultFactory.java     |   57 -
 .../MultiLineFacetOnPropertyAnnotation.java        |   35 -
 .../properties/projection/ProjectingFacet.java     |   30 -
 .../projection/ProjectingFacetAbstract.java        |   41 -
 .../ProjectingFacetFromPropertyAnnotation.java     |   70 --
 .../property/PropertyAnnotationFacetFactory.java   |  377 -------
 .../command/CommandFacetForPropertyAnnotation.java |   99 --
 ...mandFacetForPropertyAnnotationAsConfigured.java |   37 -
 .../DisabledFacetForPropertyAnnotation.java        |   65 --
 ...acetForPropertyAnnotationInvertedSemantics.java |   32 -
 .../FileAcceptFacetForPropertyAnnotation.java      |   47 -
 .../hidden/HiddenFacetForPropertyAnnotation.java   |   56 -
 .../MandatoryFacetForPropertyAnnotation.java       |   90 --
 ...acetInvertedByNullableAnnotationOnProperty.java |   61 --
 .../MaxLengthFacetForPropertyAnnotation.java       |   46 -
 ...ropertyClearFacetForDomainEventFromDefault.java |   41 -
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 -
 .../property/modify/PropertyDomainEventFacet.java  |   33 -
 .../modify/PropertyDomainEventFacetAbstract.java   |  167 ---
 .../modify/PropertyDomainEventFacetDefault.java    |   40 -
 ...pertyDomainEventFacetForPropertyAnnotation.java |   40 -
 ...opertySetterFacetForDomainEventFromDefault.java |   42 -
 ...rFacetForDomainEventFromPropertyAnnotation.java |   41 -
 ...tySetterOrClearFacetForDomainEventAbstract.java |  340 ------
 .../facets/properties/property/modify/Utils.java   |   23 -
 ...sfySpecificationFacetForPropertyAnnotation.java |   66 --
 .../NotPersistedFacetForPropertyAnnotation.java    |   46 -
 ...ublishedPropertyFacetForPropertyAnnotation.java |   79 --
 ...ertyFacetForPropertyAnnotationAsConfigured.java |   27 -
 .../PublishedPropertyFacetFromConfiguration.java   |   31 -
 .../RegExFacetForPatternAnnotationOnProperty.java  |   76 --
 .../regex/RegExFacetForPropertyAnnotation.java     |   70 --
 .../CssClassFacetForPropertyLayoutAnnotation.java  |   47 -
 .../CssClassFacetForPropertyXml.java               |   42 -
 ...escribedAsFacetForPropertyLayoutAnnotation.java |   47 -
 .../DescribedAsFacetForPropertyXml.java            |   42 -
 .../HiddenFacetForPropertyLayoutAnnotation.java    |   56 -
 .../propertylayout/HiddenFacetForPropertyXml.java  |   51 -
 .../LabelAtFacetForPropertyLayoutAnnotation.java   |   47 -
 .../propertylayout/LabelAtFacetForPropertyXml.java |   42 -
 .../MultiLineFacetForPropertyLayoutAnnotation.java |   46 -
 .../MultiLineFacetForPropertyXml.java              |   41 -
 .../NamedFacetForPropertyLayoutAnnotation.java     |   51 -
 .../propertylayout/NamedFacetForPropertyXml.java   |   47 -
 ...romptStyleFacetForPropertyLayoutAnnotation.java |   96 --
 .../PromptStyleFacetForPropertyXml.java            |   57 -
 .../propertylayout/PropertyLayoutFacetFactory.java |  194 ----
 ...edAdjustedFacetForPropertyLayoutAnnotation.java |   58 -
 .../RenderedAdjustedFacetForPropertyXml.java       |   45 -
 ...icalLengthFacetForPropertyLayoutAnnotation.java |   60 --
 .../TypicalLengthFacetForPropertyXml.java          |   56 -
 ...UnchangingFacetForPropertyLayoutAnnotation.java |   59 --
 .../UnchangingFacetForPropertyXml.java             |   42 -
 .../properties/publish/PublishedPropertyFacet.java |   29 -
 .../publish/PublishedPropertyFacetAbstract.java    |   38 -
 ...nderedAsDayBeforeFacetAnnotationOnProperty.java |   38 -
 .../renderunchanged/UnchangingFacet.java           |   30 -
 .../renderunchanged/UnchangingFacetAbstract.java   |   36 -
 .../properties/searchable/SearchableFacet.java     |   49 -
 .../searchable/SearchableFacetAbstract.java        |   51 -
 .../TypicalLengthFacetOnPropertyAnnotation.java    |   50 -
 ...ypicalLengthFacetOnPropertyDerivedFromType.java |   49 -
 ...FacetOnPropertyDerivedFromTypeFacetFactory.java |   55 -
 .../update/NotPersistableFacetInferred.java        |   31 -
 .../update/PropertyModifyFacetFactory.java         |   68 --
 .../update/PropertySetAndClearFacetFactory.java    |  122 ---
 .../update/clear/PropertyClearFacet.java           |   43 -
 .../update/clear/PropertyClearFacetAbstract.java   |   35 -
 .../clear/PropertyClearFacetViaClearMethod.java    |   74 --
 .../clear/PropertyClearFacetViaSetterMethod.java   |   75 --
 .../update/init/PropertyInitializationFacet.java   |   48 -
 .../init/PropertyInitializationFacetAbstract.java  |   35 -
 ...PropertyInitializationFacetViaSetterMethod.java |   70 --
 .../update/modify/PropertySetterFacet.java         |   49 -
 .../update/modify/PropertySetterFacetAbstract.java |   35 -
 .../modify/PropertySetterFacetViaModifyMethod.java |   81 --
 .../modify/PropertySetterFacetViaSetterMethod.java |   76 --
 .../validating/PropertyValidateFacet.java          |   50 -
 .../validating/PropertyValidateFacetAbstract.java  |   57 -
 .../validating/PropertyValidateFacetNone.java      |   47 -
 .../dflt/PropertyValidateFacetDefault.java         |   49 -
 .../dflt/PropertyValidateFacetDefaultFactory.java  |   58 -
 .../method/PropertyValidateFacetViaMethod.java     |   83 --
 .../PropertyValidateFacetViaMethodFactory.java     |   76 --
 .../DateAndTimeValueSemanticsProviderAbstract.java |  116 --
 .../isis/metamodel/facets/value/JodaFunctions.java |   43 -
 .../ValueSemanticsProviderAbstractTemporal.java    |  373 -------
 .../value/bigdecimal/BigDecimalValueFacet.java     |   60 --
 .../bigdecimal/BigDecimalValueFacetAbstract.java   |   37 -
 ...malValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../BigDecimalValueSemanticsProvider.java          |  143 ---
 .../value/biginteger/BigIntegerValueFacet.java     |   26 -
 ...gerValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../BigIntegerValueSemanticsProvider.java          |  110 --
 .../facets/value/blobs/BlobValueFacet.java         |   26 -
 ...lobValueFacetUsingSemanticsProviderFactory.java |   41 -
 .../value/blobs/BlobValueSemanticsProvider.java    |  123 ---
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../BooleanPrimitiveValueSemanticsProvider.java    |   55 -
 .../facets/value/booleans/BooleanValueFacet.java   |   29 -
 .../BooleanValueSemanticsProviderAbstract.java     |  129 ---
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../BooleanWrapperValueSemanticsProvider.java      |   69 --
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../bytes/BytePrimitiveValueSemanticsProvider.java |   52 -
 .../facets/value/bytes/ByteValueFacet.java         |   30 -
 .../bytes/ByteValueSemanticsProviderAbstract.java  |  116 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../bytes/ByteWrapperValueSemanticsProvider.java   |   41 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../chars/CharPrimitiveValueSemanticsProvider.java |   54 -
 .../facets/value/chars/CharValueFacet.java         |   30 -
 .../chars/CharValueSemanticsProviderAbstract.java  |  103 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../chars/CharWrapperValueSemanticsProvider.java   |   41 -
 .../facets/value/clobs/ClobValueFacet.java         |   26 -
 ...lobValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../value/clobs/ClobValueSemanticsProvider.java    |  117 --
 .../facets/value/date/DateValueFacet.java          |   33 -
 .../date/DateValueSemanticsProviderAbstract.java   |  121 ---
 .../value/datejdk8local/Jdk8LocalDateUtil.java     |  170 ---
 .../datejdk8local/Jdk8LocalDateValueFacet.java     |   33 -
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8LocalDateValueSemanticsProvider.java       |  257 -----
 .../facets/value/datejdk8local/TimeFormatter.java  |   27 -
 .../facets/value/datejdk8local/TimeParser.java     |   27 -
 .../value/datejodalocal/JodaLocalDateUtil.java     |  130 ---
 .../datejodalocal/JodaLocalDateValueFacet.java     |   33 -
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaLocalDateValueSemanticsProvider.java       |  257 -----
 ...ateValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../datesql/JavaSqlDateValueSemanticsProvider.java |   98 --
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   |  157 ---
 .../Jdk8LocalDateTimeValueFacet.java               |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  275 -----
 .../value/datetimejdk8local/TimeFormatter.java     |   27 -
 .../facets/value/datetimejdk8local/TimeParser.java |   27 -
 .../Jdk8OffsetDateTimeValueFacet.java              |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  |  103 --
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  121 ---
 .../value/datetimejoda/JodaDateTimeValueFacet.java |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaDateTimeValueSemanticsProvider.java        |  103 --
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  121 ---
 .../datetimejodalocal/JodaLocalDateTimeUtil.java   |  127 ---
 .../JodaLocalDateTimeValueFacet.java               |   33 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   45 -
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  259 -----
 ...ateValueFacetUsingSemanticsProviderFactory.java |   46 -
 .../JavaUtilDateValueSemanticsProvider.java        |   85 --
 .../doubles/DoubleFloatingPointValueFacet.java     |   30 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../DoublePrimitiveValueSemanticsProvider.java     |   54 -
 .../DoubleValueSemanticsProviderAbstract.java      |  120 ---
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../DoubleWrapperValueSemanticsProvider.java       |   42 -
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../FloatPrimitiveValueSemanticsProvider.java      |   54 -
 .../FloatValueSemanticsProviderAbstract.java       |  116 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../floats/FloatWrapperValueSemanticsProvider.java |   41 -
 .../value/floats/FloatingPointValueFacet.java      |   30 -
 .../facets/value/image/ImageValueFacet.java        |   34 -
 ...ageValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../value/image/ImageValueSemanticsProvider.java   |  100 --
 .../image/ImageValueSemanticsProviderAbstract.java |  298 ------
 ...ageValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../JavaAwtImageValueSemanticsProvider.java        |   83 --
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../IntPrimitiveValueSemanticsProvider.java        |   54 -
 .../integer/IntValueSemanticsProviderAbstract.java |  114 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../integer/IntWrapperValueSemanticsProvider.java  |   41 -
 .../facets/value/integer/IntegerValueFacet.java    |   30 -
 .../localrespath/LocalResourcePathValueFacet.java  |   32 -
 ...athValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../LocalResourcePathValueSemanticsProvider.java   |  130 ---
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../longs/LongPrimitiveValueSemanticsProvider.java |   52 -
 .../facets/value/longs/LongValueFacet.java         |   30 -
 .../longs/LongValueSemanticsProviderAbstract.java  |  113 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../longs/LongWrapperValueSemanticsProvider.java   |   41 -
 .../facets/value/markup/MarkupValueFacet.java      |   30 -
 ...kupValueFacetUsingSemanticsProviderFactory.java |   38 -
 .../value/markup/MarkupValueSemanticsProvider.java |  114 --
 .../facets/value/password/PasswordValueFacet.java  |   33 -
 ...ordValueFacetUsingSemanticsProviderFactory.java |   43 -
 .../password/PasswordValueSemanticsProvider.java   |  119 ---
 ...iveValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../ShortPrimitiveValueSemanticsProvider.java      |   52 -
 .../facets/value/shortint/ShortValueFacet.java     |   30 -
 .../ShortValueSemanticsProviderAbstract.java       |  115 --
 ...perValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../ShortWrapperValueSemanticsProvider.java        |   41 -
 .../facets/value/string/StringValueFacet.java      |   31 -
 ...ingValueFacetUsingSemanticsProviderFactory.java |   42 -
 .../value/string/StringValueSemanticsProvider.java |  126 ---
 .../time/TimeValueSemanticsProviderAbstract.java   |  110 --
 .../JodaLocalTimeValueFacetSimpleFactory.java      |   46 -
 ...imeValueFacetUsingSemanticsProviderFactory.java |   46 -
 .../timesql/JavaSqlTimeValueSemanticsProvider.java |   95 --
 ...ampValueFacetUsingSemanticsProviderFactory.java |   47 -
 .../JavaSqlTimeStampValueSemanticsProvider.java    |   84 --
 .../TimeStampValueSemanticsProviderAbstract.java   |  101 --
 .../facets/value/treenode/TreeNodeValueFacet.java  |   27 -
 ...odeValueFacetUsingSemanticsProviderFactory.java |   40 -
 .../treenode/TreeNodeValueSemanticsProvider.java   |  136 ---
 .../metamodel/facets/value/url/URLValueFacet.java  |   31 -
 ...URLValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../value/url/URLValueSemanticsProvider.java       |  127 ---
 .../facets/value/uuid/UUIDValueFacet.java          |   33 -
 ...UIDValueFacetUsingSemanticsProviderFactory.java |   44 -
 .../value/uuid/UUIDValueSemanticsProvider.java     |  112 --
 .../isis/metamodel/interactions/AccessContext.java |   42 -
 .../interactions/ActionArgUsabilityContext.java    |   76 --
 .../interactions/ActionArgValidityContext.java     |   68 --
 .../interactions/ActionArgVisibilityContext.java   |   76 --
 .../interactions/ActionInteractionContext.java     |   31 -
 .../interactions/ActionUsabilityContext.java       |   60 --
 .../interactions/ActionValidityContext.java        |   64 --
 .../interactions/ActionVisibilityContext.java      |   60 --
 .../interactions/CollectionAccessContext.java      |   48 -
 .../interactions/CollectionAddToContext.java       |   56 -
 .../interactions/CollectionRemoveFromContext.java  |   58 -
 .../interactions/CollectionUsabilityContext.java   |   48 -
 .../interactions/CollectionVisibilityContext.java  |   50 -
 .../interactions/DisablingInteractionAdvisor.java  |   46 -
 .../interactions/HidingInteractionAdvisor.java     |   47 -
 .../interactions/InteractionAdvisorFacet.java      |   45 -
 .../metamodel/interactions/InteractionContext.java |  171 ---
 .../metamodel/interactions/InteractionUtils.java   |   81 --
 .../metamodel/interactions/ObjectTitleContext.java |   56 -
 .../interactions/ObjectValidityContext.java        |   53 -
 .../interactions/ObjectVisibilityContext.java      |   55 -
 .../metamodel/interactions/ParseValueContext.java  |   59 --
 .../interactions/PropertyAccessContext.java        |   60 --
 .../interactions/PropertyModifyContext.java        |   61 --
 .../interactions/PropertyUsabilityContext.java     |   50 -
 .../interactions/PropertyVisibilityContext.java    |   50 -
 .../metamodel/interactions/ProposedHolder.java     |   38 -
 .../metamodel/interactions/UsabilityContext.java   |   55 -
 .../interactions/ValidatingInteractionAdvisor.java |   51 -
 .../metamodel/interactions/ValidityContext.java    |   42 -
 .../metamodel/interactions/VisibilityContext.java  |   54 -
 .../isis/metamodel/layout/DeweyOrderSet.java       |  404 -------
 .../MemberIdentifierComparator.java                |   44 -
 .../memberorderfacet/MemberOrderComparator.java    |   90 --
 .../MemberOrderFacetComparator.java                |   56 -
 .../OrderSetGroupNameComparator.java               |   55 -
 .../metamodel/objectmanager/ObjectManager.java     |  107 --
 .../objectmanager/ObjectManagerDefault.java        |   77 --
 .../objectmanager/create/ObjectCreator.java        |   82 --
 .../create/ObjectCreator_builtinHandlers.java      |  386 -------
 .../objectmanager/identify/ObjectIdentifier.java   |   63 --
 .../identify/ObjectIdentifier_builtinHandlers.java |  139 ---
 .../metamodel/objectmanager/load/ObjectLoader.java |   80 --
 .../load/ObjectLoader_builtinHandlers.java         |  259 -----
 .../objectmanager/refresh/ObjectRefresher.java     |   67 --
 .../refresh/ObjectRefresher_builtinHandlers.java   |  107 --
 ...arameterChoicesFacetFromParentedCollection.java |   76 --
 ...meterDefaultsFacetFromAssociatedCollection.java |   64 --
 .../param/DeriveFacetsPostProcessor.java           |  633 -----------
 .../ObjectSpecificationPostProcessor.java          |   28 -
 .../isis/metamodel/progmodel/ProgrammingModel.java |  179 ----
 .../progmodel/ProgrammingModelAbstract.java        |  253 -----
 .../progmodel/ProgrammingModelInitFilter.java      |   81 --
 .../ProgrammingModelInitFilterDefault.java         |   86 --
 .../progmodel/ProgrammingModelService.java         |   32 -
 .../dflt/ProgrammingModelFacetsJava8.java          |  388 -------
 .../isis/metamodel/services/CollectionHelper.java  |  100 --
 .../metamodel/services/ServiceInjectorDefault.java |   75 --
 .../metamodel/services/ServiceInjectorLegacy.java  |  286 -----
 .../isis/metamodel/services/ServiceUtil.java       |   41 -
 .../services/appfeat/ApplicationFeature.java       |  324 ------
 .../appfeat/ApplicationFeatureFactory.java         |   45 -
 .../services/appfeat/ApplicationFeatureId.java     |  492 ---------
 .../ApplicationFeatureRepositoryDefault.java       |  555 ----------
 .../services/appfeat/ApplicationFeatureType.java   |  102 --
 .../classsubstitutor/ClassSubstitutor.java         |   28 -
 .../classsubstitutor/ClassSubstitutorAbstract.java |  137 ---
 .../classsubstitutor/ClassSubstitutorDefault.java  |   76 --
 .../ClassSubstitutorForCollections.java            |   66 --
 .../classsubstitutor/ClassSubstitutorRegistry.java |   80 --
 .../command/CommandDtoServiceInternal.java         |   71 --
 .../services/container/query/QueryCardinality.java |   31 -
 .../metamodel/services/devutils/MemberType.java    |   25 -
 .../services/events/MetamodelEventService.java     |   94 --
 .../events/MetamodelEventSupport_Spring.java       |   77 --
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   88 --
 .../services/grid/GridLoaderServiceDefault.java    |  257 -----
 .../services/grid/GridReaderUsingJaxb.java         |   76 --
 .../services/grid/GridServiceDefault.java          |  209 ----
 .../services/grid/GridSystemServiceAbstract.java   |  699 ------------
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  674 ------------
 .../services/homepage/HomePageAction.java          |   63 --
 .../services/homepage/HomePageResolverService.java |   35 -
 .../metamodel/services/homepage/package-info.java  |   26 -
 .../ixn/InteractionDtoServiceInternal.java         |   51 -
 .../services/layout/LayoutServiceDefault.java      |  147 ---
 .../services/message/MessageServiceNoop.java       |   88 --
 .../services/metamodel/DomainMemberDefault.java    |  301 ------
 .../services/metamodel/DomainModelDefault.java     |   58 -
 .../services/metamodel/MetaModelExportSupport.java |   31 -
 .../services/metamodel/MetaModelExporter.java      |  570 ----------
 .../metamodel/MetaModelServiceDefault.java         |  272 -----
 .../isis/metamodel/services/metamodel/Util.java    |   35 -
 .../publishing/PublisherDispatchService.java       |   46 -
 .../services/registry/ServiceRegistryDefault.java  |  103 --
 .../services/registry/SpringContextProvider.java   |   23 -
 .../services/title/TitleServiceDefault.java        |   83 --
 .../title/TitlesAndTranslationsValidator.java      |  166 ---
 .../services/user/UserServiceDefault.java          |  177 ----
 .../org/apache/isis/metamodel/spec/ActionType.java |   41 -
 .../isis/metamodel/spec/DefaultProvider.java       |   31 -
 .../org/apache/isis/metamodel/spec/Described.java  |   35 -
 .../isis/metamodel/spec/DomainModelException.java  |   47 -
 .../spec/ElementSpecificationProvider.java         |   44 -
 .../apache/isis/metamodel/spec/EntityState.java    |   49 -
 .../isis/metamodel/spec/FreeStandingList.java      |   96 --
 .../apache/isis/metamodel/spec/Hierarchical.java   |   65 --
 .../metamodel/spec/InjectorMethodEvaluator.java    |   31 -
 .../apache/isis/metamodel/spec/ManagedObject.java  |  734 -------------
 .../spec/ObjectInstantiationException.java         |   41 -
 .../apache/isis/metamodel/spec/ObjectSpecId.java   |   62 --
 .../isis/metamodel/spec/ObjectSpecification.java   |  443 --------
 .../spec/ObjectSpecificationException.java         |   36 -
 .../apache/isis/metamodel/spec/Specification.java  |   50 -
 .../isis/metamodel/spec/feature/Contributed.java   |   31 -
 .../isis/metamodel/spec/feature/CurrentHolder.java |   46 -
 .../spec/feature/MutableCurrentHolder.java         |   64 --
 .../isis/metamodel/spec/feature/ObjectAction.java  |  589 -----------
 .../spec/feature/ObjectActionContainer.java        |   80 --
 .../spec/feature/ObjectActionParameter.java        |  235 ----
 .../metamodel/spec/feature/ObjectAssociation.java  |  253 -----
 .../spec/feature/ObjectAssociationContainer.java   |   72 --
 .../isis/metamodel/spec/feature/ObjectFeature.java |   79 --
 .../isis/metamodel/spec/feature/ObjectMember.java  |  227 ----
 .../spec/feature/OneToManyActionParameter.java     |   28 -
 .../spec/feature/OneToManyAssociation.java         |  101 --
 .../metamodel/spec/feature/OneToManyFeature.java   |   40 -
 .../spec/feature/OneToOneActionParameter.java      |   28 -
 .../spec/feature/OneToOneAssociation.java          |   53 -
 .../metamodel/spec/feature/OneToOneFeature.java    |   28 -
 .../isis/metamodel/specloader/CollectionUtils.java |   61 --
 .../specloader/InjectorMethodEvaluatorDefault.java |   91 --
 .../specloader/ProgrammingModelServiceDefault.java |  104 --
 .../specloader/ReflectiveActionException.java      |   43 -
 .../specloader/SpecificationCacheDefault.java      |  134 ---
 .../metamodel/specloader/SpecificationLoader.java  |  137 ---
 .../specloader/SpecificationLoaderDefault.java     |  521 ---------
 .../SpecificationLoaderDefault_debug.java          |   79 --
 .../specloader/classsubstitutor/ProxyEnhanced.java |   28 -
 .../specloader/facetprocessor/FacetProcessor.java  |  486 ---------
 .../isis/metamodel/specloader/package-info.java    |   43 -
 .../specloader/postprocessor/PostProcessor.java    |   59 --
 .../specloader/specimpl/ContributeeMember.java     |   67 --
 .../specloader/specimpl/FacetedMethodsBuilder.java |  614 -----------
 .../metamodel/specloader/specimpl/Factories.java   |   96 --
 .../specloader/specimpl/IntrospectionState.java    |   47 -
 .../specloader/specimpl/MixedInMember.java         |   40 -
 .../specimpl/ObjectActionContributee.java          |  253 -----
 .../specloader/specimpl/ObjectActionDefault.java   |  688 ------------
 .../specloader/specimpl/ObjectActionMixedIn.java   |  260 -----
 .../specimpl/ObjectActionParameterAbstract.java    |  492 ---------
 .../specimpl/ObjectActionParameterContributee.java |   25 -
 .../ObjectActionParameterContributeeAbstract.java  |   93 --
 .../specimpl/ObjectActionParameterMixedIn.java     |   25 -
 .../ObjectActionParameterMixedInAbstract.java      |   85 --
 .../specimpl/ObjectAssociationAbstract.java        |   97 --
 .../specloader/specimpl/ObjectMemberAbstract.java  |  409 -------
 .../specimpl/ObjectSpecificationAbstract.java      | 1118 -------------------
 .../OneToManyActionParameterContributee.java       |   43 -
 .../specimpl/OneToManyActionParameterDefault.java  |   43 -
 .../specimpl/OneToManyActionParameterMixedIn.java  |   40 -
 .../specimpl/OneToManyAssociationContributee.java  |  191 ----
 .../specimpl/OneToManyAssociationDefault.java      |  288 -----
 .../specimpl/OneToManyAssociationMixedIn.java      |  221 ----
 .../OneToOneActionParameterContributee.java        |   38 -
 .../specimpl/OneToOneActionParameterDefault.java   |   37 -
 .../specimpl/OneToOneActionParameterMixedIn.java   |   35 -
 .../specimpl/OneToOneAssociationContributee.java   |  174 ---
 .../specimpl/OneToOneAssociationDefault.java       |  361 -------
 .../specimpl/OneToOneAssociationMixedIn.java       |  206 ----
 .../metamodel/specloader/specimpl/Predicates.java  |  168 ---
 .../isis/metamodel/specloader/specimpl/Utils.java  |  103 --
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  456 --------
 .../CollectionFacetOnStandaloneList.java           |   73 --
 .../DescribedAsFacetOnStandaloneList.java          |   31 -
 .../standalonelist/NamedFacetOnStandaloneList.java |   31 -
 .../ObjectSpecificationOnStandaloneList.java       |  186 ----
 .../PluralFacetOnStandaloneList.java               |   31 -
 .../traverser/TypeExtractorAbstract.java           |   84 --
 .../traverser/TypeExtractorMethodParameters.java   |   60 --
 .../traverser/TypeExtractorMethodReturn.java       |   47 -
 .../validator/MetaModelInvalidException.java       |   33 -
 .../specloader/validator/MetaModelValidator.java   |   44 -
 .../validator/MetaModelValidatorAbstract.java      |   69 --
 ...etaModelValidatorForConflictingOptionality.java |   62 --
 .../MetaModelValidatorForDeprecatedAbstract.java   |   68 --
 .../MetaModelValidatorForDeprecatedAnnotation.java |   54 -
 ...etaModelValidatorForDeprecatedMethodPrefix.java |   52 -
 .../MetaModelValidatorForValidationFailures.java   |   23 -
 .../validator/MetaModelValidatorVisiting.java      |  111 --
 .../specloader/validator/ValidationFailure.java    |   61 --
 .../specloader/validator/ValidationFailures.java   |  112 --
 .../isis/metamodel/util/DeweyOrderComparator.java  |   37 -
 .../org/apache/isis/metamodel/util/EventUtil.java  |   43 -
 .../isis/metamodel/util/pchain/ParentChain.java    |   83 --
 .../metamodel/util/pchain/ParentChainDefault.java  |   49 -
 .../isis/metamodel/util/snapshot/Helper.java       |   91 --
 .../isis/metamodel/util/snapshot/IsisSchema.java   |  181 ----
 .../apache/isis/metamodel/util/snapshot/Place.java |   65 --
 .../isis/metamodel/util/snapshot/XmlSchema.java    |  648 ------------
 .../isis/metamodel/util/snapshot/XmlSnapshot.java  |  916 ----------------
 .../isis/metamodel/util/snapshot/XsMetaModel.java  |  337 ------
 .../metamodel/valuetypes/ValueTypeDefinition.java  |   45 -
 .../metamodel/valuetypes/ValueTypeProvider.java    |   34 -
 .../valuetypes/ValueTypeProviderDefault.java       |   55 -
 .../ValueTypeProviderForCollections.java           |   56 -
 .../metamodel/valuetypes/ValueTypeRegistry.java    |   96 --
 .../metamodel/MetaModelContext_configTest.java     |   77 ++
 .../metamodel/MetaModelContext_forTesting.java     |  256 +++++
 .../core/metamodel/ServiceInjector_forTesting.java |   70 ++
 .../core/metamodel/ServiceRegistry_forTesting.java |  154 +++
 .../oid/CollectionOidTest_valueSemantics.java      |   47 +
 .../adapter/oid/OidMarshallerTest_marshall.java    |   50 +
 .../oid/OidMarshallerTest_roundtripping.java       |   59 ++
 .../adapter/oid/OidMarshallerTest_unmarshal.java   |  154 +++
 .../core/metamodel/adapter/oid/OidVersionTest.java |   70 ++
 ...dDefaultTest_valueSemantics_whenPersistent.java |   45 +
 ...idDefaultTest_valueSemantics_whenTransient.java |   46 +
 .../metamodel/adapter/oid/RootOidTest_create.java  |   62 ++
 .../core/metamodel/commons/IoUtils_CopyTest.java   |  136 +++
 .../commons/JavaClassUtilsTest_getBuiltIn.java     |   41 +
 .../metamodel/commons/ListUtilsTest_adjust.java    |   67 ++
 .../metamodel/commons/ListUtilsTest_insert.java    |   84 ++
 .../commons/ListUtilsTest_mutableCopy.java         |   89 ++
 .../core/metamodel/commons/LocaleUtilsTest.java    |   36 +
 .../isis/core/metamodel/commons/NameUtilTest.java  |   68 ++
 .../isis/core/metamodel/commons/PrintLocale.java   |   59 ++
 .../commons/StringUtilsTest_enumTitle.java         |   41 +
 .../commons/StringUtils_NaturalNameTest.java       |   59 ++
 .../commons/StringUtils_NaturalizeTest.java        |   49 +
 .../commons/StringUtils_NormalizedTest.java        |   65 ++
 .../StringUtils_RemoveLeadingWhiteSpace.java       |   51 +
 .../commons/StringUtils_SplitOnCommas.java         |   80 ++
 .../commons/StringUtils_StripLeadingSlashTest.java |   49 +
 .../commons/StringUtils_StripNewLinesTest.java     |   59 ++
 .../commons/StringUtils_camelLowerFirst.java       |   38 +
 .../commons/StringUtils_toLineSeparated.java       |   52 +
 .../commons/StringUtils_toLowerDashed.java         |   36 +
 .../metamodel/commons/TypesTest_filteredList.java  |   71 ++
 .../metamodel/commons/matchers/IsisMatchers.java   |   73 ++
 .../matchers/IsisMatchers_NonEmptyStringTest.java  |   53 +
 .../metamodel/consent/InteractionResultTest.java   |   85 ++
 .../core/metamodel/facetapi/FacetAbstractTest.java |   76 ++
 .../facetapi/FeatureTypeTest_identifierFor.java    |   85 ++
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |  159 +++
 .../metamodel/facets/AbstractFacetFactoryTest.java |  169 +++
 .../core/metamodel/facets/AnnotationsTest.java     |   71 ++
 .../Annotations_getAnnotations_on_Class_Test.java  |  248 +++++
 .../Annotations_getAnnotations_on_Field_Test.java  |  203 ++++
 .../Annotations_getAnnotations_on_Method_Test.java |  184 ++++
 ...notations_getAnnotations_on_Parameter_Test.java |  200 ++++
 .../core/metamodel/facets/CollectionUtilsTest.java |  123 +++
 ...nEventHelperTest_newActionInteractionEvent.java |   87 ++
 ...HelperTest_newCollectionDomainEvent_forAdd.java |   84 ++
 ...perTest_newCollectionDomainEvent_forRemove.java |   84 ++
 ...HelperTest_newPropertyDomainEvent_forClear.java |   76 ++
 ...elperTest_newPropertyDomainEvent_forModify.java |   72 ++
 .../metamodel/facets/MethodFinderUtilsTest.java    |   72 ++
 .../metamodel/facets/MethodRemoverForTesting.java  |   81 ++
 .../metamodel/facets/ObjectAdapterUtilsTest.java   |   84 ++
 .../apache/isis/core/metamodel/facets/Utils.java   |   64 ++
 .../actions/ActionMethodsFacetFactoryTest.java     |  539 ++++++++++
 .../actions/IteratorFilteringFacetFactoryTest.java |   91 ++
 .../action/ActionAnnotationFacetFactoryTest.java   |  118 +++
 ...nnotationFacetFactoryTest_ActionInvocation.java |  234 ++++
 .../ActionAnnotationFacetFactoryTest_Command.java  |  313 ++++++
 .../ActionAnnotationFacetFactoryTest_Hidden.java   |   72 ++
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  211 ++++
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  313 ++++++
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |  109 ++
 ...ActionAnnotationFacetFactoryTest_Semantics.java |  111 ++
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |  177 ++++
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   73 ++
 .../PrototypeFacetAnnotationFactoryTest.java       |   77 ++
 ...kmarkableAnnotationFacetFactoryTest_action.java |   63 ++
 .../HomePageAnnotationFacetFactoryTest.java        |   66 ++
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |  407 +++++++
 ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java |  197 ++++
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  222 ++++
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  223 ++++
 .../prototype/PrototypeFacetAbstractTest.java      |   58 +
 .../CollectionFieldMethodsFacetFactoryTest.java    |  589 +++++++++++
 .../collections/JavaCollectionFacetTest.java       |   90 ++
 .../CollectionAnnotationFacetFactoryTest.java      |  570 ++++++++++
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |  137 +++
 ...bledAnnotationOnCollectionFacetFactoryTest.java |   82 ++
 ...stedAnnotationOnCollectionFacetFactoryTest.java |   71 ++
 ...etForCollectionLayoutAnnotationFactoryTest.java |   86 ++
 .../cssclassfa/CssClassFaFacetAbstractTest.java    |   45 +
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  240 +++++
 ...okmarkableAnnotationFacetFactoryTest_class.java |   63 ++
 .../callback/CreatedCallbackFacetFactoryTest.java  |   67 ++
 .../callback/DeleteCallbackFacetFactoryTest.java   |   88 ++
 .../callback/LoadCallbackFacetFactoryTest.java     |   88 ++
 .../PersistAndSaveCallbackFacetFactoryTest.java    |  109 ++
 .../callback/PersistCallbackFacetFactoryTest.java  |   88 ++
 .../RemoveAndDeleteCallbackFacetFactoryTest.java   |  109 ++
 .../callback/RemoveCallbackFacetFactoryTest.java   |   88 ++
 .../callback/SaveCallbackFacetFactoryTest.java     |   88 ++
 .../callback/UpdateCallbackFacetFactoryTest.java   |   88 ++
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |   68 ++
 .../object/defaults/DefaultedFacetFactoryTest.java |  228 ++++
 .../ObjectDisabledMethodFacetFactoryTest.java      |   72 ++
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   60 ++
 .../DomainObjectAnnotationFacetFactoryTest.java    |  861 +++++++++++++++
 .../ObjectTypeAnnotationFacetFactoryTest.java      |   65 ++
 .../DomainObjectLayoutFactoryTest.java             |  670 ++++++++++++
 .../DomainServiceFacetAnnotationFactoryTest.java   |   66 ++
 .../DomainServiceLayoutFacetFactoryTest.java       |  123 +++
 .../facets/FacetsFacetAnnotationFactoryTest.java   |  153 +++
 .../hidden/ObjectHiddenMethodFacetFactoryTest.java |   85 ++
 .../cssclass/CssClassFacetMethodFactoryTest.java   |   71 ++
 .../ident/cssclass/CssClassFacetMethodTest.java    |   85 ++
 .../CssClassFacetMethodWithProblemTest.java        |   84 ++
 .../ident/icon/IconFacetMethodFactoryTest.java     |   71 ++
 .../object/ident/icon/IconFacetMethodTest.java     |   84 ++
 .../ident/layout/LayoutFacetFactoryTest.java       |   71 ++
 .../object/ident/layout/LayoutFacetMethodTest.java |   84 ++
 .../ident/title/TitleFacetViaMethodTest.java       |   97 ++
 .../title/TitleFacetViaMethodsFactoryTest.java     |  112 ++
 .../TitleAnnotationFacetFactoryTest.java           |  262 +++++
 .../TitleFacetViaTitleAnnotationTest.java          |  153 +++
 .../object/layoutxml/GridFacetDefaultTest.java     |   60 ++
 .../navparent/NavigableParentFacetMethodTest.java  |   84 ++
 .../NavigableParentAnnotationFacetFactoryTest.java |  113 ++
 .../annotation/NavigableParentTestSamples.java     |   68 ++
 ...SpecIdFacetDerivedFromClassNameFactoryTest.java |   63 ++
 .../parseable/ParseableFacetUsingParserTest.java   |  131 +++
 .../facets/object/parseable/ValueProxy.java        |   23 +
 .../RecreatableObjectFacetFactoryTest.java         |   68 ++
 .../ObjectValidMethodFacetFactoryTest.java         |   66 ++
 ...eFacetAnnotationOrConfigurationFactoryTest.java |  504 +++++++++
 .../ordering/memberorder/DeweyOrderSetTest.java    |  265 +++++
 .../MemberOrderAnnotationFacetFactoryTest.java     |  143 +++
 .../memberorder/MemberOrderComparatorTest.java     |  181 ++++
 ...cetForParameterLayoutAnnotationFactoryTest.java |   58 +
 ...cetForParameterLayoutAnnotationFactoryTest.java |   79 ++
 .../ParameterAnnotationFacetFactoryTest.java       |  388 +++++++
 ...lableAnnotationOnParameterFacetFactoryTest.java |  106 ++
 ...RegExAnnotationOnParameterFacetFactoryTest.java |   79 ++
 .../PropertyMethodsFacetFactoryTest.java           |  671 ++++++++++++
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  185 ++++
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |  102 ++
 .../MandatoryAnnotationFacetFactoryTest.java       |   71 ++
 ...sistedAnnotationOnPropertyFacetFactoryTest.java |   71 ++
 .../PropertyAnnotationFacetFactoryTest.java        |  868 +++++++++++++++
 ...llableAnnotationOnPropertyFacetFactoryTest.java |  118 +++
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |   90 ++
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   68 ++
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   95 ++
 ...ValidationDigitsAnnotationFacetFactoryTest.java |   79 ++
 .../DomainObjectWithMustSatisfyAnnotations.java    |   48 +
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   48 +
 .../SpecificationAlwaysSatisfied.java              |   31 +
 .../specification/SpecificationAndTests.java       |  111 ++
 .../specification/SpecificationNeverSatisfied.java |   31 +
 .../specification/SpecificationNotTests.java       |   62 ++
 .../specification/SpecificationOrTests.java        |  110 ++
 ...cificationRequiresFirstLetterToBeUpperCase.java |   39 +
 .../BigDecimalValueSemanticsProviderTest.java      |   89 ++
 .../value/BigIntValueSemanticsProviderTest.java    |   88 ++
 .../value/BlobValueSemanticsProviderTest.java      |   65 ++
 .../value/BooleanValueSemanticsProviderTest.java   |  113 ++
 .../value/ByteValueSemanticsProviderTest.java      |   86 ++
 .../value/CharacterValueSemanticsProviderTest.java |   79 ++
 .../value/ClobValueSemanticsProviderTest.java      |   65 ++
 .../value/DoubleValueSemanticsProviderTest.java    |   84 ++
 .../value/FloatValueSemanticsProviderTest.java     |   93 ++
 .../ImageValueSemanticsProviderAbstractTest.java   |  126 +++
 .../value/IntValueSemanticsProviderTest.java       |   80 ++
 .../JavaSqlDateValueSemanticsProviderTest.java     |   91 ++
 .../JavaSqlTimeValueSemanticsProviderTest.java     |   90 ++
 .../JavaUtilDateValueSemanticsProviderTest.java    |   96 ++
 .../value/LongValueSemanticsProviderTest.java      |   91 ++
 .../value/PasswordValueSemanticsProviderTest.java  |   49 +
 .../value/ShortValueSemanticsProviderTest.java     |   87 ++
 .../value/StringValueSemanticsProviderTest.java    |   80 ++
 .../core/metamodel/facets/value/TestClock.java     |   69 ++
 .../ValueSemanticsProviderAbstractTestCase.java    |  165 +++
 ...odaLocalDateTimeValueSemanticsProviderTest.java |   81 ++
 ...jectAssociationPredicatesTest_visibleWhere.java |  150 +++
 .../interactions/InteractionUtils_isA_Test.java    |  104 ++
 .../ServiceInjectorDefaultTest_usingFields.java    |  144 +++
 ...erviceInjectorDefaultTest_validateServices.java |   81 ++
 ...InjectorDefaultTest_validateServices_happy.java |   89 ++
 .../services/ServiceInjectorLegacyTest.java        |  166 +++
 .../services/appfeat/ApplicationFeatureIdTest.java |  691 ++++++++++++
 .../ApplicationFeatureRepositoryDefaultTest.java   |  323 ++++++
 .../services/appfeat/ApplicationFeatureTest.java   |  163 +++
 .../appfeat/ApplicationFeatureTypeTest.java        |  191 ++++
 ...eptionRecognizerDocDefault_recognizes_Test.java |   57 +
 .../core/metamodel/services/grid/BS3GridTest.java  |  165 +++
 .../isis/core/metamodel/services/grid/Foo.java     |   22 +
 .../metamodel/services/grid/Foo.layout.xml         |    0
 .../isis/core/metamodel/services/grid/Foo2.java    |   22 +
 .../services/grid/Foo2.layout.fallback.xml         |    0
 .../isis/core/metamodel/services/grid/Foo3.java    |   22 +
 .../services/grid/Foo3.layout.fallback.xml         |    0
 .../metamodel/services/grid/Foo3.layout.xml        |    0
 .../isis/core/metamodel/services/grid/Foo4.java    |   22 +
 ...dLoaderServiceDefault_resourceNameFor_Test.java |   58 +
 .../services/menubars/BS3MenuBarsTest.java         |   62 ++
 .../metamodel/MetaModelServiceDefaultTest.java     |  242 +++++
 .../spec/ObjectSpecIdTest_constructor.java         |   43 +
 .../spec/ObjectSpecIdTest_valueSemantics.java      |   38 +
 .../metamodel/specloader/ReflectorTestPojo.java    |   52 +
 .../specloader/SpecificationCacheDefaultTest.java  |  120 +++
 .../SpecificationLoaderTestAbstract.java           |  185 ++++
 .../specloader/SpecificationLoaderTest_array.java  |   65 ++
 .../SpecificationLoaderTest_collection.java        |   67 ++
 .../specloader/SpecificationLoaderTest_value.java  |   46 +
 .../ClassSubstitutorTest_getClass.java             |   69 ++
 .../IntrospectionState_comparable_Test.java        |   87 ++
 .../specimpl/ObjectActionMixedInTest.java          |   64 ++
 ...ionParameterAbstractTest_getId_and_getName.java |  214 ++++
 .../specimpl/ObjectAssociationAbstractTest.java    |  211 ++++
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  229 ++++
 .../specimpl/ObjectMemberAbstractTest.java         |   43 +
 .../testspec/ObjectSpecificationStub.java          |  358 +++++++
 .../metamodel/MetaModelContext_configTest.java     |   77 --
 .../metamodel/MetaModelContext_forTesting.java     |  256 -----
 .../isis/metamodel/ServiceInjector_forTesting.java |   70 --
 .../isis/metamodel/ServiceRegistry_forTesting.java |  154 ---
 .../oid/CollectionOidTest_valueSemantics.java      |   47 -
 .../adapter/oid/OidMarshallerTest_marshall.java    |   51 -
 .../oid/OidMarshallerTest_roundtripping.java       |   60 --
 .../adapter/oid/OidMarshallerTest_unmarshal.java   |  154 ---
 .../isis/metamodel/adapter/oid/OidVersionTest.java |   71 --
 ...dDefaultTest_valueSemantics_whenPersistent.java |   45 -
 ...idDefaultTest_valueSemantics_whenTransient.java |   46 -
 .../metamodel/adapter/oid/RootOidTest_create.java  |   63 --
 .../isis/metamodel/commons/IoUtils_CopyTest.java   |  136 ---
 .../commons/JavaClassUtilsTest_getBuiltIn.java     |   41 -
 .../metamodel/commons/ListUtilsTest_adjust.java    |   67 --
 .../metamodel/commons/ListUtilsTest_insert.java    |   84 --
 .../commons/ListUtilsTest_mutableCopy.java         |   89 --
 .../isis/metamodel/commons/LocaleUtilsTest.java    |   36 -
 .../isis/metamodel/commons/NameUtilTest.java       |   68 --
 .../apache/isis/metamodel/commons/PrintLocale.java |   59 --
 .../commons/StringUtilsTest_enumTitle.java         |   41 -
 .../commons/StringUtils_NaturalNameTest.java       |   59 --
 .../commons/StringUtils_NaturalizeTest.java        |   49 -
 .../commons/StringUtils_NormalizedTest.java        |   65 --
 .../StringUtils_RemoveLeadingWhiteSpace.java       |   51 -
 .../commons/StringUtils_SplitOnCommas.java         |   80 --
 .../commons/StringUtils_StripLeadingSlashTest.java |   49 -
 .../commons/StringUtils_StripNewLinesTest.java     |   59 --
 .../commons/StringUtils_camelLowerFirst.java       |   38 -
 .../commons/StringUtils_toLineSeparated.java       |   52 -
 .../commons/StringUtils_toLowerDashed.java         |   36 -
 .../metamodel/commons/TypesTest_filteredList.java  |   71 --
 .../metamodel/commons/matchers/IsisMatchers.java   |   73 --
 .../matchers/IsisMatchers_NonEmptyStringTest.java  |   53 -
 .../metamodel/consent/InteractionResultTest.java   |   85 --
 .../isis/metamodel/facetapi/FacetAbstractTest.java |   76 --
 .../facetapi/FeatureTypeTest_identifierFor.java    |   85 --
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |  159 ---
 .../metamodel/facets/AbstractFacetFactoryTest.java |  169 ---
 .../isis/metamodel/facets/AnnotationsTest.java     |   71 --
 .../Annotations_getAnnotations_on_Class_Test.java  |  248 -----
 .../Annotations_getAnnotations_on_Field_Test.java  |  203 ----
 .../Annotations_getAnnotations_on_Method_Test.java |  184 ----
 ...notations_getAnnotations_on_Parameter_Test.java |  200 ----
 .../isis/metamodel/facets/CollectionUtilsTest.java |  123 ---
 ...nEventHelperTest_newActionInteractionEvent.java |   87 --
 ...HelperTest_newCollectionDomainEvent_forAdd.java |   84 --
 ...perTest_newCollectionDomainEvent_forRemove.java |   84 --
 ...HelperTest_newPropertyDomainEvent_forClear.java |   76 --
 ...elperTest_newPropertyDomainEvent_forModify.java |   72 --
 .../metamodel/facets/MethodFinderUtilsTest.java    |   72 --
 .../metamodel/facets/MethodRemoverForTesting.java  |   81 --
 .../metamodel/facets/ObjectAdapterUtilsTest.java   |   84 --
 .../org/apache/isis/metamodel/facets/Utils.java    |   64 --
 .../actions/ActionMethodsFacetFactoryTest.java     |  538 ----------
 .../actions/IteratorFilteringFacetFactoryTest.java |   91 --
 .../action/ActionAnnotationFacetFactoryTest.java   |  118 ---
 ...nnotationFacetFactoryTest_ActionInvocation.java |  234 ----
 .../ActionAnnotationFacetFactoryTest_Command.java  |  313 ------
 .../ActionAnnotationFacetFactoryTest_Hidden.java   |   72 --
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  211 ----
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  313 ------
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |  109 --
 ...ActionAnnotationFacetFactoryTest_Semantics.java |  111 --
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |  177 ----
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   73 --
 .../PrototypeFacetAnnotationFactoryTest.java       |   77 --
 ...kmarkableAnnotationFacetFactoryTest_action.java |   63 --
 .../HomePageAnnotationFacetFactoryTest.java        |   66 --
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |  407 -------
 ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java |  197 ----
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  222 ----
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  223 ----
 .../prototype/PrototypeFacetAbstractTest.java      |   58 -
 .../CollectionFieldMethodsFacetFactoryTest.java    |  589 -----------
 .../collections/JavaCollectionFacetTest.java       |   90 --
 .../CollectionAnnotationFacetFactoryTest.java      |  572 ----------
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |  137 ---
 ...bledAnnotationOnCollectionFacetFactoryTest.java |   82 --
 ...stedAnnotationOnCollectionFacetFactoryTest.java |   71 --
 ...etForCollectionLayoutAnnotationFactoryTest.java |   86 --
 .../cssclassfa/CssClassFaFacetAbstractTest.java    |   45 -
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  240 -----
 ...okmarkableAnnotationFacetFactoryTest_class.java |   63 --
 .../callback/CreatedCallbackFacetFactoryTest.java  |   67 --
 .../callback/DeleteCallbackFacetFactoryTest.java   |   88 --
 .../callback/LoadCallbackFacetFactoryTest.java     |   88 --
 .../PersistAndSaveCallbackFacetFactoryTest.java    |  109 --
 .../callback/PersistCallbackFacetFactoryTest.java  |   88 --
 .../RemoveAndDeleteCallbackFacetFactoryTest.java   |  109 --
 .../callback/RemoveCallbackFacetFactoryTest.java   |   88 --
 .../callback/SaveCallbackFacetFactoryTest.java     |   88 --
 .../callback/UpdateCallbackFacetFactoryTest.java   |   88 --
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |   68 --
 .../object/defaults/DefaultedFacetFactoryTest.java |  228 ----
 .../ObjectDisabledMethodFacetFactoryTest.java      |   72 --
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   60 --
 .../DomainObjectAnnotationFacetFactoryTest.java    |  861 ---------------
 .../ObjectTypeAnnotationFacetFactoryTest.java      |   65 --
 .../DomainObjectLayoutFactoryTest.java             |  670 ------------
 .../DomainServiceFacetAnnotationFactoryTest.java   |   66 --
 .../DomainServiceLayoutFacetFactoryTest.java       |  123 ---
 .../facets/FacetsFacetAnnotationFactoryTest.java   |  153 ---
 .../hidden/ObjectHiddenMethodFacetFactoryTest.java |   85 --
 .../cssclass/CssClassFacetMethodFactoryTest.java   |   71 --
 .../ident/cssclass/CssClassFacetMethodTest.java    |   85 --
 .../CssClassFacetMethodWithProblemTest.java        |   84 --
 .../ident/icon/IconFacetMethodFactoryTest.java     |   71 --
 .../object/ident/icon/IconFacetMethodTest.java     |   84 --
 .../ident/layout/LayoutFacetFactoryTest.java       |   71 --
 .../object/ident/layout/LayoutFacetMethodTest.java |   84 --
 .../ident/title/TitleFacetViaMethodTest.java       |   97 --
 .../title/TitleFacetViaMethodsFactoryTest.java     |  112 --
 .../TitleAnnotationFacetFactoryTest.java           |  263 -----
 .../TitleFacetViaTitleAnnotationTest.java          |  154 ---
 .../object/layoutxml/GridFacetDefaultTest.java     |   60 --
 .../navparent/NavigableParentFacetMethodTest.java  |   84 --
 .../NavigableParentAnnotationFacetFactoryTest.java |  113 --
 .../annotation/NavigableParentTestSamples.java     |   68 --
 ...SpecIdFacetDerivedFromClassNameFactoryTest.java |   67 --
 .../parseable/ParseableFacetUsingParserTest.java   |  131 ---
 .../facets/object/parseable/ValueProxy.java        |   23 -
 .../RecreatableObjectFacetFactoryTest.java         |   68 --
 .../ObjectValidMethodFacetFactoryTest.java         |   66 --
 ...eFacetAnnotationOrConfigurationFactoryTest.java |  504 ---------
 .../ordering/memberorder/DeweyOrderSetTest.java    |  265 -----
 .../MemberOrderAnnotationFacetFactoryTest.java     |  143 ---
 .../memberorder/MemberOrderComparatorTest.java     |  181 ----
 ...cetForParameterLayoutAnnotationFactoryTest.java |   58 -
 ...cetForParameterLayoutAnnotationFactoryTest.java |   79 --
 .../ParameterAnnotationFacetFactoryTest.java       |  388 -------
 ...lableAnnotationOnParameterFacetFactoryTest.java |  106 --
 ...RegExAnnotationOnParameterFacetFactoryTest.java |   79 --
 .../PropertyMethodsFacetFactoryTest.java           |  671 ------------
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  185 ----
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |  102 --
 .../MandatoryAnnotationFacetFactoryTest.java       |   71 --
 ...sistedAnnotationOnPropertyFacetFactoryTest.java |   71 --
 .../PropertyAnnotationFacetFactoryTest.java        |  869 ---------------
 ...llableAnnotationOnPropertyFacetFactoryTest.java |  118 ---
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |   90 --
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   68 --
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   95 --
 ...ValidationDigitsAnnotationFacetFactoryTest.java |   80 --
 .../DomainObjectWithMustSatisfyAnnotations.java    |   48 -
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   48 -
 .../SpecificationAlwaysSatisfied.java              |   31 -
 .../specification/SpecificationAndTests.java       |  111 --
 .../specification/SpecificationNeverSatisfied.java |   31 -
 .../specification/SpecificationNotTests.java       |   62 --
 .../specification/SpecificationOrTests.java        |  110 --
 ...cificationRequiresFirstLetterToBeUpperCase.java |   39 -
 .../BigDecimalValueSemanticsProviderTest.java      |   89 --
 .../value/BigIntValueSemanticsProviderTest.java    |   88 --
 .../value/BlobValueSemanticsProviderTest.java      |   65 --
 .../value/BooleanValueSemanticsProviderTest.java   |  113 --
 .../value/ByteValueSemanticsProviderTest.java      |   86 --
 .../value/CharacterValueSemanticsProviderTest.java |   79 --
 .../value/ClobValueSemanticsProviderTest.java      |   65 --
 .../value/DoubleValueSemanticsProviderTest.java    |   84 --
 .../value/FloatValueSemanticsProviderTest.java     |   93 --
 .../ImageValueSemanticsProviderAbstractTest.java   |  126 ---
 .../value/IntValueSemanticsProviderTest.java       |   80 --
 .../JavaSqlDateValueSemanticsProviderTest.java     |   91 --
 .../JavaSqlTimeValueSemanticsProviderTest.java     |   90 --
 .../JavaUtilDateValueSemanticsProviderTest.java    |   96 --
 .../value/LongValueSemanticsProviderTest.java      |   91 --
 .../value/PasswordValueSemanticsProviderTest.java  |   49 -
 .../value/ShortValueSemanticsProviderTest.java     |   87 --
 .../value/StringValueSemanticsProviderTest.java    |   80 --
 .../isis/metamodel/facets/value/TestClock.java     |   69 --
 .../ValueSemanticsProviderAbstractTestCase.java    |  165 ---
 ...odaLocalDateTimeValueSemanticsProviderTest.java |   81 --
 ...jectAssociationPredicatesTest_visibleWhere.java |  150 ---
 .../interactions/InteractionUtils_isA_Test.java    |  104 --
 .../ServiceInjectorDefaultTest_usingFields.java    |  144 ---
 ...erviceInjectorDefaultTest_validateServices.java |   81 --
 ...InjectorDefaultTest_validateServices_happy.java |   89 --
 .../services/ServiceInjectorLegacyTest.java        |  166 ---
 .../services/appfeat/ApplicationFeatureIdTest.java |  691 ------------
 .../ApplicationFeatureRepositoryDefaultTest.java   |  323 ------
 .../services/appfeat/ApplicationFeatureTest.java   |  163 ---
 .../appfeat/ApplicationFeatureTypeTest.java        |  191 ----
 ...eptionRecognizerDocDefault_recognizes_Test.java |   57 -
 .../isis/metamodel/services/grid/BS3GridTest.java  |  165 ---
 .../apache/isis/metamodel/services/grid/Foo.java   |   22 -
 .../apache/isis/metamodel/services/grid/Foo2.java  |   22 -
 .../apache/isis/metamodel/services/grid/Foo3.java  |   22 -
 .../apache/isis/metamodel/services/grid/Foo4.java  |   22 -
 ...dLoaderServiceDefault_resourceNameFor_Test.java |   58 -
 .../services/menubars/BS3MenuBarsTest.java         |   62 --
 .../metamodel/MetaModelServiceDefaultTest.java     |  242 -----
 .../spec/ObjectSpecIdTest_constructor.java         |   43 -
 .../spec/ObjectSpecIdTest_valueSemantics.java      |   38 -
 .../metamodel/specloader/ReflectorTestPojo.java    |   52 -
 .../specloader/SpecificationCacheDefaultTest.java  |  120 ---
 .../SpecificationLoaderTestAbstract.java           |  185 ----
 .../specloader/SpecificationLoaderTest_array.java  |   65 --
 .../SpecificationLoaderTest_collection.java        |   67 --
 .../specloader/SpecificationLoaderTest_value.java  |   46 -
 .../ClassSubstitutorTest_getClass.java             |   69 --
 .../IntrospectionState_comparable_Test.java        |   91 --
 .../specimpl/ObjectActionMixedInTest.java          |   64 --
 ...ionParameterAbstractTest_getId_and_getName.java |  214 ----
 .../specimpl/ObjectAssociationAbstractTest.java    |  211 ----
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  229 ----
 .../specimpl/ObjectMemberAbstractTest.java         |   43 -
 .../testspec/ObjectSpecificationStub.java          |  358 -------
 .../dom/CustomerAsProxiedByDataNucleus.java        |    2 +-
 .../services/menubars/menubars.layout.xml          |    0
 .../org/apache/isis/runtime/IsisModuleRuntime.java |    2 +-
 .../apache/isis/runtime/context/IsisContext.java   |    2 +-
 .../runtime/context/session/RuntimeContext.java    |    6 +-
 .../context/session/RuntimeContextBase.java        |    8 +-
 .../persistence/adapter/ObjectAdapterForBean.java  |    8 +-
 .../runtime/persistence/adapter/PojoAdapter.java   |   12 +-
 .../persistence/session/PersistenceSession.java    |    8 +-
 .../session/PersistenceSessionFactory.java         |    2 +-
 .../transaction/AdapterAndProperty.java            |    8 +-
 .../transaction/AuditerDispatchService.java        |    6 +-
 .../transaction/ChangedObjectsService.java         |   10 +-
 .../apache/isis/runtime/session/IsisSession.java   |    4 +-
 .../runtime/session/IsisSessionFactoryDefault.java |    4 +-
 .../system/ObjectActionLayoutXmlDefaultTest.java   |   14 +-
 .../system/OneToManyAssociationDefaultTest.java    |   22 +-
 .../system/TypeExtractorMethodReturnTest.java      |    2 +-
 .../system/TypeExtractorMethodsParametersTest.java |    2 +-
 .../auth/AuthenticationSessionProviderDefault.java |    2 +-
 .../bookmarks/BookmarkServiceInternalDefault.java  |   12 +-
 .../command/CommandDtoServiceInternalDefault.java  |   16 +-
 .../command/CommandExecutorServiceDefault.java     |   18 +-
 .../factory/FactoryServiceDefault.java             |   10 +-
 .../homepage/HomePageResolverServiceDefault.java   |   20 +-
 .../ixn/InteractionDtoServiceInternalDefault.java  |   12 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   24 +-
 .../menubars/bootstrap3/ServiceAndAction.java      |    4 +-
 .../publish/PublishedObjectsDefault.java           |    4 +-
 .../publish/PublisherDispatchServiceDefault.java   |    6 +-
 .../repository/RepositoryServiceDefault.java       |    4 +-
 .../routing/RoutingServiceDefault.java             |    2 +-
 .../wrapper/WrapperFactoryDefault.java             |    2 +-
 .../AbstractCollectionInvocationHandler.java       |    2 +-
 .../handlers/CollectionInvocationHandler.java      |    4 +-
 .../DelegatingInvocationHandlerDefault.java        |    6 +-
 .../handlers/DomainObjectInvocationHandler.java    |   42 +-
 .../wrapper/handlers/MapInvocationHandler.java     |    4 +-
 .../wrapper/handlers/ProxyContextHandler.java      |    4 +-
 .../wrapper/internal/util/MethodPrefixFinder.java  |   26 +-
 .../wrapper/proxy/ProxyCreator.java                |    2 +-
 .../xmlsnapshot/XmlSnapshotBuilder.java            |    8 +-
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |    6 +-
 .../webapp/context/IsisWebAppCommonContext.java    |    8 +-
 .../isis/webapp/context/memento/ObjectMemento.java |    2 +-
 .../context/memento/ObjectMementoCollection.java   |    2 +-
 .../context/memento/ObjectMementoService.java      |    6 +-
 .../templresources/TemplateResourceServlet.java    |    6 +-
 .../apache/isis/webapp/routing/RedirectFilter.java |    2 +-
 .../isis/webapp/routing/RedirectServlet.java       |    2 +-
 .../bootstrapping/AutoConfigurationTest.java       |    4 +-
 .../SpringServiceInjectOrderTest.java              |    2 +-
 .../SpringServiceProvisioningTest.java             |    2 +-
 .../DomainModelTest_usingBadDomain.java            |    4 +-
 ...nModelTest_usingBadDomain_noActionEnforced.java |    4 +-
 .../DomainModelTest_usingGoodDomain.java           |    6 +-
 .../domainmodel/SpecloaderPerformanceTest.java     |    2 +-
 .../publishing/PublisherServiceTest.java           |    2 +-
 .../bootstrapping/builtin-domain-services.list     |    4 +-
 .../api/permission/ApplicationPermission.java      |    2 +-
 .../api/permission/ApplicationPermissionMode.java  |    2 +-
 .../ApplicationPermissionRepository.java           |    2 +-
 .../api/permission/ApplicationPermissionRule.java  |    2 +-
 .../api/permission/ApplicationPermissionValue.java |    2 +-
 .../permission/ApplicationPermissionValueSet.java  |    2 +-
 .../permission/PermissionsEvaluationService.java   |    2 +-
 .../PermissionsEvaluationServiceAbstract.java      |    2 +-
 .../extensions/secman/api/user/AccountType.java    |    2 +-
 .../secman/api/user/ApplicationUserStatus.java     |    2 +-
 .../secman/model/app/feature/ApplicationClass.java |    2 +-
 .../model/app/feature/ApplicationClassAction.java  |    2 +-
 .../app/feature/ApplicationClassCollection.java    |    2 +-
 .../model/app/feature/ApplicationClassMember.java  |    2 +-
 .../app/feature/ApplicationClassProperty.java      |    2 +-
 .../app/feature/ApplicationFeatureViewModel.java   |    8 +-
 .../app/feature/ApplicationFeatureViewModels.java  |    4 +-
 .../model/app/feature/ApplicationPackage.java      |    4 +-
 .../app/feature/ApplicationPermission_feature.java |    4 +-
 .../user/ApplicationUser_filterPermissions.java    |    6 +-
 .../app/user/ApplicationUser_permissions.java      |    4 +-
 .../model/app/user/UserPermissionViewModel.java    |    8 +-
 .../model/facets/TenantedAuthorizationFacet.java   |    6 +-
 .../facets/TenantedAuthorizationFacetDefault.java  |   10 +-
 .../facets/TenantedAuthorizationFacetFactory.java  |    8 +-
 .../jdo/dom/permission/ApplicationPermission.java  |    8 +-
 .../ApplicationPermissionRepository.java           |    8 +-
 .../secman/jdo/dom/role/ApplicationRole.java       |    4 +-
 .../secman/jdo/dom/user/ApplicationUser.java       |    2 +-
 .../AbstractRoleAndPermissionsFixtureScript.java   |    2 +-
 .../secman/shiro/PermissionForMember.java          |    2 +-
 .../ui/components/ExcelFileModel.java              |    8 +-
 .../pdfjs/metamodel/facet/PdfJsViewerFacet.java    |    2 +-
 .../metamodel/facet/PdfJsViewerFacetAbstract.java  |    6 +-
 .../facet/PdfJsViewerFacetFromAnnotation.java      |    2 +-
 .../PdfJsViewerFacetFromAnnotationFactory.java     |   12 +-
 .../pdfjs/ui/components/PdfJsViewerPanel.java      |    2 +-
 .../PdfJsViewerPanelComponentFactory.java          |    2 +-
 .../SupportingMethodValidatorRefinerFactory.java   |   16 +-
 .../services/IncubatorMetaModelPlugin.java         |    4 +-
 .../facets/value/color/ColorValueFacet.java        |    4 +-
 ...lorValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../value/color/ColorValueSemanticsProvider.java   |   10 +-
 .../facets/value/money/MoneyValueFacet.java        |    4 +-
 ...neyValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../value/money/MoneyValueSemanticsProvider.java   |   12 +-
 ...ageValueFacetUsingSemanticsProviderFactory.java |    4 +-
 .../PercentageValueSemanticsProvider.java          |   12 +-
 .../value/ColorValueSemanticsProviderTest.java     |    8 +-
 .../value/MoneyValueSemanticsProviderTest.java     |   10 +-
 .../PercentageValueSemanticsProviderTest.java      |    8 +-
 .../PolishMoneyValueSemanticsProviderTest.java     |   10 +-
 .../runtime/system/persistence/ObjectFactory.java  |    2 +-
 .../runtime/viewer/web/WebAppSpecification.java    |    2 +-
 .../datanucleus/DataNucleusContextUtil.java        |    2 +-
 .../datanucleus/DataNucleusException.java          |    2 +-
 .../datanucleus/JDOStateManagerForIsis.java        |    2 +-
 .../datanucleus/metamodel/JdoPropertyUtils.java    |    8 +-
 .../commands/AbstractDataNucleusObjectCommand.java |    2 +-
 .../commands/DataNucleusCreateObjectCommand.java   |    2 +-
 .../commands/DataNucleusDeleteObjectCommand.java   |    2 +-
 .../PersistenceQueryFindAllInstancesProcessor.java |    2 +-
 ...sistenceQueryFindUsingApplibQueryProcessor.java |   10 +-
 .../queries/PersistenceQueryProcessor.java         |    2 +-
 .../queries/PersistenceQueryProcessorAbstract.java |    2 +-
 .../datanucleus/persistence/queries/QueryUtil.java |    2 +-
 .../persistence/spi/JdoObjectIdSerializer.java     |    6 +-
 .../service/JdoPersistenceLifecycleService.java    |    2 +-
 .../datanucleus5/jdosupport/IsisJdoSupportDN5.java |    4 +-
 .../metamodel/JdoProgrammingModelPlugin.java       |   26 +-
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |    8 +-
 .../JdoDatastoreIdentityFacet.java                 |    2 +-
 .../JdoDatastoreIdentityFacetAbstract.java         |    6 +-
 .../JdoDatastoreIdentityFacetAnnotation.java       |    2 +-
 .../JdoDatastoreIdentityFacetImpl.java             |    2 +-
 .../JdoDiscriminatorAnnotationFacetFactory.java    |   18 +-
 .../discriminator/JdoDiscriminatorFacet.java       |    2 +-
 .../JdoDiscriminatorFacetDefault.java              |    4 +-
 ...nferredFromJdoDiscriminatorValueAnnotation.java |    4 +-
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |    6 +-
 ...doPersistenceCapableAnnotationFacetFactory.java |   14 +-
 .../JdoPersistenceCapableFacet.java                |    2 +-
 .../JdoPersistenceCapableFacetAbstract.java        |    8 +-
 .../JdoPersistenceCapableFacetAnnotation.java      |    2 +-
 .../JdoPersistenceCapableFacetImpl.java            |   10 +-
 .../facets/object/query/JdoNamedQuery.java         |    4 +-
 .../object/query/JdoQueriesFacetAnnotation.java    |    2 +-
 .../query/JdoQueryAnnotationFacetFactory.java      |   12 +-
 .../facets/object/query/JdoQueryFacet.java         |    2 +-
 .../facets/object/query/JdoQueryFacetAbstract.java |    8 +-
 .../object/query/JdoQueryFacetAnnotation.java      |    2 +-
 .../object/query/VisitorForClauseAbstract.java     |   10 +-
 .../facets/object/query/VisitorForFromClause.java  |    8 +-
 .../object/query/VisitorForVariablesClause.java    |    8 +-
 .../version/JdoVersionAnnotationFacetFactory.java  |   20 +-
 .../facets/object/version/JdoVersionFacet.java     |    2 +-
 .../version/JdoVersionFacetFromAnnotation.java     |    4 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   28 +-
 .../BigDecimalFacetDerivedFromJdoColumn.java       |    8 +-
 .../prop/column/BigDecimalFacetFallback.java       |   10 +-
 .../column/MandatoryFacetDerivedFromJdoColumn.java |    4 +-
 ...ndatoryFacetInferredFromAbsenceOfJdoColumn.java |    4 +-
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |   30 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   28 +-
 .../column/MaxLengthFacetDerivedFromJdoColumn.java |    4 +-
 .../JdoNotPersistentAnnotationFacetFactory.java    |    8 +-
 .../prop/notpersistent/JdoNotPersistentFacet.java  |    4 +-
 .../JdoNotPersistentFacetAbstract.java             |    6 +-
 .../JdoNotPersistentFacetAnnotation.java           |    2 +-
 .../notpersistent/JdoNotPersistentFacetImpl.java   |    2 +-
 ...FacetDerivedFromJdoNotPersistentAnnotation.java |    4 +-
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |    4 +-
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |    6 +-
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |    4 +-
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |    6 +-
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |    2 +-
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |    2 +-
 ...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java |    6 +-
 .../util/JdoPrimaryKeyPropertyPredicate.java       |    8 +-
 .../objectadapter/ObjectAdapterContext.java        |   28 +-
 .../ObjectAdapterContext_DependencyInjection.java  |    2 +-
 .../ObjectAdapterContext_Factories.java            |   10 +-
 ...ObjectAdapterContext_LifecycleEventSupport.java |    4 +-
 .../ObjectAdapterContext_NewIdentifier.java        |   10 +-
 ...ctAdapterContext_ObjectAdapterByIdProvider.java |   18 +-
 ...ObjectAdapterContext_ObjectAdapterProvider.java |   10 +-
 .../ObjectAdapterContext_ObjectCreation.java       |   16 +-
 .../DataNucleusApplicationComponents5.java         |    4 +-
 .../persistence/IsisLifecycleListener.java         |    2 +-
 .../persistence/IsisPersistenceSessionJdo.java     |    2 +-
 .../persistence/IsisPersistenceSessionJdoBase.java |   10 +-
 .../persistence/IsisTransactionJdo.java            |    6 +-
 .../persistence/PersistenceSession5.java           |   54 +-
 .../persistence/PersistenceSessionFactory5.java    |    2 +-
 .../persistence/command/PersistenceCommand.java    |    2 +-
 .../command/PersistenceCommandAbstract.java        |    2 +-
 .../persistence/query/PersistenceQuery.java        |    2 +-
 .../query/PersistenceQueryAbstract.java            |    2 +-
 .../persistence/query/PersistenceQueryFactory.java |    8 +-
 .../query/PersistenceQueryFindAllInstances.java    |    4 +-
 ...ersistenceQueryFindUsingApplibQueryDefault.java |   10 +-
 .../ObjectReflectorDefaultTest_object.java         |   81 ++
 .../ObjectReflectorDefaultTest_object.java         |   81 --
 ...atastoreIdentityAnnotationFacetFactoryTest.java |    8 +-
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |   14 +-
 ...rsistenceCapableAnnotationFacetFactoryTest.java |   10 +-
 .../JdoVersionAnnotationFacetFactoryTest.java      |    8 +-
 ...AnnotationFacetFactoryTest_refineMetaModel.java |   14 +-
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |   10 +-
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |    8 +-
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |   10 +-
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |   12 +-
 .../adapterfactory/pojo/PojoAdapterTest.java       |    8 +-
 .../transaction/PojoAdapterBuilder.java            |   10 +-
 .../runtime/system/ObjectMemberAbstractTest.java   |   48 +-
 .../WrapperFactoryDefault_wrappedObject_Test.java  |   44 +-
 ...actoryDefault_wrappedObject_transient_Test.java |   36 +-
 .../base/applib/matchers/IsisMatchers.java         |    2 +-
 .../excel/applib/dom/util/CellMarshaller.java      |    6 +-
 .../excel/applib/dom/util/ExcelConverter.java      |   16 +-
 .../excel/applib/dom/util/ExcelServiceImpl.java    |    4 +-
 .../applib/validate/ValidateDomainModel.java       |    8 +-
 .../sse/applib/value/ListeningMarkup.java          |    2 +-
 .../facets/SseAnnotationFacetFactory.java          |   10 +-
 .../sse/metamodel/facets/SseObserveFacet.java      |    2 +-
 .../metamodel/facets/SseObserveFacetAbstract.java  |    8 +-
 ...eObserveFacetForServerSentEventsAnnotation.java |    2 +-
 .../restfulobjects/rendering/IResourceContext.java |    8 +-
 .../viewer/restfulobjects/rendering/OidUtils.java  |    6 +-
 .../rendering/ReprRendererAbstract.java            |    6 +-
 .../AbstractObjectMemberReprRenderer.java          |   13 +-
 .../domainobjects/ActionResultReprRenderer.java    |    7 +-
 .../domainobjects/CollectionSemantics.java         |    2 +-
 .../domainobjects/DomainObjectLinkTo.java          |    4 +-
 .../domainobjects/DomainObjectReprRenderer.java    |   22 +-
 .../domainobjects/DomainServiceLinkTo.java         |    4 +-
 .../rendering/domainobjects/JsonValueEncoder.java  |   12 +-
 .../domainobjects/JsonValueEncoder_Converters.java |    2 +-
 .../rendering/domainobjects/ListReprRenderer.java  |    4 +-
 .../rendering/domainobjects/MemberType.java        |   30 +-
 .../rendering/domainobjects/MutatorSpec.java       |    2 +-
 .../domainobjects/ObjectActionReprRenderer.java    |   10 +-
 .../domainobjects/ObjectAdapterLinkTo.java         |    4 +-
 .../rendering/domainobjects/ObjectAndAction.java   |    4 +-
 .../domainobjects/ObjectAndActionInvocation.java   |   10 +-
 .../domainobjects/ObjectAndCollection.java         |    4 +-
 .../domainobjects/ObjectAndCollection2.java        |    4 +-
 .../rendering/domainobjects/ObjectAndMember.java   |    4 +-
 .../rendering/domainobjects/ObjectAndProperty.java |    4 +-
 .../domainobjects/ObjectAndProperty2.java          |    4 +-
 .../ObjectCollectionReprRenderer.java              |    8 +-
 .../domainobjects/ObjectPropertyReprRenderer.java  |   16 +-
 .../domainobjects/ScalarValueReprRenderer.java     |    6 +-
 .../AbstractTypeFeatureReprRenderer.java           |    4 +-
 .../AbstractTypeMemberReprRenderer.java            |    2 +-
 .../domaintypes/ActionDescriptionReprRenderer.java |    8 +-
 .../ActionParameterDescriptionReprRenderer.java    |    8 +-
 .../CollectionDescriptionReprRenderer.java         |    4 +-
 .../domaintypes/DomainTypeReprRenderer.java        |   12 +-
 .../domaintypes/ObjectSpecAndSuperSpec.java        |    2 +-
 .../rendering/domaintypes/ParentSpecAndAction.java |    4 +-
 .../domaintypes/ParentSpecAndActionParam.java      |    4 +-
 .../domaintypes/ParentSpecAndCollection.java       |    4 +-
 .../domaintypes/ParentSpecAndFeature.java          |    4 +-
 .../domaintypes/ParentSpecAndProperty.java         |    4 +-
 .../PropertyDescriptionReprRenderer.java           |    6 +-
 .../domaintypes/TypeActionResultReprRenderer.java  |    2 +-
 .../domaintypes/TypeListReprRenderer.java          |    2 +-
 .../rendering/service/RepresentationService.java   |    2 +-
 .../RepresentationServiceContentNegotiator.java    |    2 +-
 .../service/conneg/ContentNegotiationService.java  |    2 +-
 .../conneg/ContentNegotiationServiceAbstract.java  |    2 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.java |   10 +-
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |   16 +-
 .../ContentNegotiationServiceXRoDomainType.java    |    2 +-
 .../service/swagger/internal/ClassExcluder.java    |    4 +-
 .../swagger/internal/ClassExcluderAbstract.java    |    4 +-
 .../service/swagger/internal/Generation.java       |   24 +-
 .../swagger/internal/SwaggerSpecGenerator.java     |    2 +-
 .../rendering/service/swagger/internal/Util.java   |   16 +-
 .../JsonValueEncoderTest_appendValueAndFormat.java |   10 +-
 .../JsonValueEncoderTest_asAdapter.java            |   14 +-
 .../JsonValueEncoderTest_asObject.java             |   12 +-
 .../viewer/context/ResourceContext.java            |    8 +-
 .../mappers/ExceptionMapperForObjectNotFound.java  |    2 +-
 .../restfulobjects/viewer/mappers/FailureUtil.java |    2 +-
 .../resources/DomainObjectResourceServerside.java  |   18 +-
 .../viewer/resources/DomainResourceHelper.java     |   10 +-
 .../resources/DomainServiceResourceServerside.java |    8 +-
 .../resources/DomainTypeResourceServerside.java    |   18 +-
 .../viewer/resources/HomePageReprRenderer.java     |    4 +-
 .../resources/HomePageResourceServerside.java      |    2 +-
 .../viewer/resources/ImageResourceServerside.java  |    2 +-
 .../viewer/resources/JsonParserHelper.java         |    8 +-
 .../resources/MenuBarsResourceServerside.java      |    2 +-
 .../viewer/resources/ObjectActionArgHelper.java    |   14 +-
 .../resources/ObjectAdapterAccessHelper.java       |   18 +-
 .../resources/ObjectAdapterUpdateHelper.java       |   14 +-
 .../viewer/resources/ResourceAbstract.java         |    8 +-
 .../viewer/resources/UserResourceServerside.java   |    2 +-
 .../resources/VersionResourceServerside.java       |    2 +-
 .../webmodule/IsisRestfulObjectsSessionFilter.java |    6 +-
 ..._ensureCompatibleAcceptHeader_ContractTest.java |    6 +-
 .../context/ResourceContext_getArg_Test.java       |    6 +-
 .../wicket/model/common/OnSelectionHandler.java    |    2 +-
 .../viewer/wicket/model/links/LinkAndLabel.java    |    6 +-
 .../wicket/model/mementos/ActionMemento.java       |   10 +-
 .../model/mementos/ActionParameterMemento.java     |    8 +-
 .../wicket/model/mementos/CollectionMemento.java   |    8 +-
 .../wicket/model/mementos/PageParameterNames.java  |    4 +-
 .../wicket/model/mementos/PropertyMemento.java     |    8 +-
 .../wicket/model/models/ActionArgumentModel.java   |    2 +-
 .../viewer/wicket/model/models/ActionModel.java    |   30 +-
 .../wicket/model/models/BookmarkTreeNode.java      |   12 +-
 .../model/models/BookmarkTreeNodeComparator.java   |    6 +-
 .../wicket/model/models/BookmarkedPagesModel.java  |    2 +-
 .../wicket/model/models/EntityCollectionModel.java |   26 +-
 .../viewer/wicket/model/models/EntityModel.java    |   16 +-
 .../model/models/EntityModelForReference.java      |    4 +-
 .../wicket/model/models/ImageResourceCache.java    |    4 +-
 .../wicket/model/models/ObjectAdapterModel.java    |    4 +-
 .../viewer/wicket/model/models/ScalarModel.java    |   38 +-
 .../model/models/ScalarModelWithMultiPending.java  |    2 +-
 .../wicket/model/models/ServiceActionsModel.java   |    4 +-
 .../viewer/wicket/model/models/ValueModel.java     |    4 +-
 .../isis/viewer/wicket/model/models/VoidModel.java |    2 +-
 .../models/whereami/WhereAmIModelDefault.java      |    2 +-
 .../wicket/model/models/EntityModel_hintsTest.java |    4 +-
 .../models/LowestCommonSuperclassClosureTest.java  |    2 +-
 .../ScalarModel_isScalarSubtypingAnyOf_Test.java   |    8 +-
 .../wicket/ui/CollectionContentsAsFactory.java     |    4 +-
 .../isis/viewer/wicket/ui/ComponentType.java       |    4 +-
 .../actionresponse/ActionResultResponseType.java   |    6 +-
 .../ui/components/about/JarManifestModel.java      |    2 +-
 .../ui/components/actioninfo/ActionInfoPanel.java  |    2 +-
 .../components/actionmenu/CssClassFaBehavior.java  |    2 +-
 .../entityactions/AdditionalLinksPanel.java        |    2 +-
 .../entityactions/EntityActionLinkFactory.java     |    4 +-
 .../actionmenu/entityactions/LinkAndLabelUtil.java |    4 +-
 .../actionmenu/serviceactions/CssMenuItem.java     |   12 +-
 .../serviceactions/ServiceActionLinkFactory.java   |    2 +-
 .../serviceactions/ServiceActionUtil.java          |    2 +-
 .../serviceactions/ServiceAndAction.java           |    2 +-
 .../actionprompt/ActionPromptHeaderPanel.java      |    4 +-
 .../actions/ActionFormExecutorStrategy.java        |    2 +-
 .../components/actions/ActionParametersForm.java   |    8 +-
 .../actions/ActionParametersFormPanel.java         |    2 +-
 .../components/actions/ActionParametersPanel.java  |    1 -
 .../bookmarkedpages/BookmarkedPagesPanel.java      |    8 +-
 .../collection/AssociatedWithActionsHelper.java    |   12 +-
 .../ui/components/collection/CollectionPanel.java  |    6 +-
 .../selector/CollectionSelectorHelper.java         |    4 +-
 .../selector/CollectionSelectorPanel.java          |    2 +-
 .../CollectionContentsAsAjaxTablePanel.java        |   20 +-
 .../CollectionContentsSortableDataProvider.java    |   18 +-
 .../ajaxtable/IsisAjaxFallbackDataTable.java       |    2 +-
 .../columns/ObjectAdapterPropertyColumn.java       |    4 +-
 .../columns/ObjectAdapterTitleColumn.java          |    2 +-
 .../columns/ObjectAdapterToggleboxColumn.java      |    2 +-
 .../icons/CollectionContentsAsIconsPanel.java      |    2 +-
 .../CollectionContentsAsIconsPanelFactory.java     |    4 +-
 .../summary/CollectionContentsAsSummary.java       |   10 +-
 .../CollectionContentsAsSummaryFactory.java        |    8 +-
 .../entity/EntityComponentFactoryAbstract.java     |    4 +-
 .../entity/collection/EntityCollectionPanel.java   |   10 +-
 .../components/entity/fieldset/PropertyGroup.java  |   14 +-
 .../entity/header/EntityHeaderPanel.java           |    2 +-
 .../entity/icontitle/EntityIconAndTitlePanel.java  |    6 +-
 .../icontitle/EntityIconAndTitlePanelFactory.java  |    4 +-
 .../selector/links/EntityLinksSelectorPanel.java   |    2 +-
 .../links/EntityLinksSelectorPanelFactory.java     |    4 +-
 .../ui/components/property/PropertyEditPanel.java  |    4 +-
 .../property/PropertyFormExecutorStrategy.java     |    2 +-
 .../PropertyEditPromptHeaderPanel.java             |    4 +-
 .../components/scalars/IsisConverterLocator.java   |    6 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |    8 +-
 .../components/scalars/ScalarPanelAbstract2.java   |   18 +-
 .../scalars/ScalarPanelSelect2Abstract.java        |    2 +-
 .../scalars/ScalarPanelTextFieldAbstract.java      |   10 +-
 .../ScalarPanelTextFieldDatePickerAbstract.java    |    2 +-
 .../ScalarPanelTextFieldParseableAbstract.java     |    4 +-
 .../ui/components/scalars/TextFieldValueModel.java |    2 +-
 .../scalars/image/JavaAwtImagePanel.java           |    4 +-
 .../scalars/image/JavaAwtImagePanelFactory.java    |    4 +-
 .../isisapplib/IsisBlobOrClobPanelAbstract.java    |    4 +-
 .../components/scalars/markup/MarkupComponent.java |    2 +-
 .../components/scalars/primitive/BooleanPanel.java |    4 +-
 .../scalars/reference/EntityLinkSelect2Panel.java  |    2 +-
 .../scalars/reference/ReferencePanel.java          |    6 +-
 .../scalars/reference/ReferencePanelFactory.java   |    4 +-
 .../scalars/string/MultiLineStringPanel.java       |    6 +-
 .../scalars/string/StringPanelFactory.java         |    2 +-
 .../scalars/value/ValuePanelFactory.java           |    2 +-
 .../valuechoices/ValueChoicesSelect2Panel.java     |    2 +-
 .../StandaloneCollectionPanel.java                 |    2 +-
 .../components/tree/IsisToWicketTreeAdapter.java   |    4 +-
 .../ui/components/unknown/UnknownModelPanel.java   |    2 +-
 .../widgets/breadcrumbs/BreadcrumbModel.java       |    6 +-
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |    4 +-
 .../entitysimplelink/EntityLinkSimplePanel.java    |    2 +-
 .../EntityLinkSimplePanelFactory.java              |    4 +-
 .../widgets/linkandlabel/ActionLink.java           |    4 +-
 .../widgets/linkandlabel/ActionLinkFactory.java    |    2 +-
 .../linkandlabel/ActionLinkFactoryAbstract.java    |   14 +-
 .../ui/components/widgets/select2/ChoiceExt.java   |    2 +-
 .../widgets/select2/Select2ChoiceExt.java          |    2 +-
 .../widgets/select2/Select2MultiChoiceExt.java     |    2 +-
 .../ObjectAdapterMementoProviderAbstract.java      |    8 +-
 ...entoProviderForReferenceObjectAutoComplete.java |    4 +-
 ...derForReferenceParamOrPropertyAutoComplete.java |    2 +-
 .../widgets/zclip/ZeroClipboardPanel.java          |    2 +-
 .../viewer/wicket/ui/errors/ExceptionModel.java    |    2 +-
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |   12 +-
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |    2 +-
 .../wicket/ui/panels/FormExecutorDefault.java      |    8 +-
 .../wicket/ui/panels/FormExecutorStrategy.java     |    2 +-
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |    2 +-
 .../wicket/ui/panels/PromptFormAbstract.java       |    2 +-
 .../ui/ComponentFactoryAbstractTest_init.java      |    4 +-
 ...ollectionContentsSelectorDropdownPanelTest.java |    4 +-
 ...tAdapterMementoProviderForValueChoicesTest.java |    6 +-
 .../integration/ConverterForObjectAdapter.java     |   10 +-
 .../ConverterForObjectAdapterMemento.java          |    6 +-
 .../viewer/integration/WebRequestCycleForIsis.java |    4 +-
 .../ComponentFactoryRegistryDefault.java           |    2 +-
 .../viewer/services/DeepLinkServiceWicket.java     |    4 +-
 .../services/ImageResourceCacheClassPath.java      |    8 +-
 .../viewer/services/mementos/CollectionData.java   |    2 +-
 .../wicket/viewer/services/mementos/Data.java      |    4 +-
 .../viewer/services/mementos/ObjectData.java       |    2 +-
 .../viewer/services/mementos/ObjectMarshaller.java |   18 +-
 .../services/mementos/ObjectMementoLegacy.java     |   16 +-
 .../mementos/ObjectMementoServiceWicket.java       |   10 +-
 .../services/mementos/ObjectUnmarshaller.java      |   36 +-
 .../viewer/services/mementos/StandaloneData.java   |    8 +-
 .../viewer/wicketapp/IsisWicketApplication.java    |    4 +-
 .../wicketapp/IsisWicketApplication_Defaults.java  |    2 +-
 3160 files changed, 120558 insertions(+), 120580 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
index 92500e0..c6e2e2a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
@@ -16,4 +16,4 @@
 #  under the License.
 
 logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
-logging.level.org.apache.isis.metamodel.specloader.SpecificationLoaderDefault = DEBUG
\ No newline at end of file
+logging.level.SpecificationLoaderDefault = DEBUG
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
index ce27d89..631c685 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-logging.level.org.apache.isis.metamodel.specloader.ProgrammingModelServiceDefault = DEBUG
-logging.level.org.apache.isis.metamodel.specloader.specimpl.FacetedMethodsBuilder = DEBUG
+logging.level.ProgrammingModelServiceDefault = DEBUG
+logging.level.FacetedMethodsBuilder = DEBUG
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
index 03be4e2..573565c 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
@@ -16,4 +16,4 @@
 #  under the License.
 
 logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
-logging.level.org.apache.isis.metamodel.specloader.SpecificationLoaderDefault = WARN
\ No newline at end of file
+logging.level.SpecificationLoaderDefault = WARN
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
index ff10cdc..8907faf 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-logging.level.org.apache.isis.metamodel.specloader.ProgrammingModelServiceDefault = WARN
-logging.level.org.apache.isis.metamodel.specloader.specimpl.FacetedMethodsBuilder = WARN
+logging.level.ProgrammingModelServiceDefault = WARN
+logging.level.FacetedMethodsBuilder = WARN
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
index b9dd308..993bb45 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.jaxb.JaxbServiceDefault;
 import org.apache.isis.core.commons.internal.reflection._Reflect.InterfacePolicy;
-import org.apache.isis.metamodel.services.user.UserServiceDefault;
+import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
 
 import static org.apache.isis.core.commons.internal.reflection._Reflect.getAnnotation;
 import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllMethods;
@@ -55,7 +55,7 @@ class ReflectTest {
                 .collect(Collectors.joining(",\n"));
 
         assertEquals(""
-                + "org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+                + "UserServiceDefault$SudoServiceSpi,\n"
                 + "java.lang.Object", 
                 typeListLiteral);
 
@@ -71,7 +71,7 @@ class ReflectTest {
                 .collect(Collectors.joining(",\n"));
 
         assertEquals(
-                "org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+                "UserServiceDefault$SudoServiceSpi,\n"
                         + "org.apache.isis.applib.services.sudo.SudoService$Spi,\n"
                         + "java.lang.Object", 
                         typeListLiteral);
@@ -91,8 +91,8 @@ class ReflectTest {
         assertEquals(""
                 + "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.releaseRunAs(),\n"
                 + "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.runAs(java.lang.String,java.util.List),\n"
-                + "public void org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
-                + "public void org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
+                + "public void UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
+                + "public void UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
                 ,
                 typeListLiteral);
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
index 8d48977..9ebfeaa 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -29,19 +29,19 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.i18n.TranslationService.Mode;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.metamodel.MetaModelContext_forTesting;
-import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facetapi.FeatureType;
-import org.apache.isis.metamodel.facetapi.MethodRemover;
-import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.FacetedMethodParameter;
-import org.apache.isis.metamodel.facets.MethodRemoverConstants;
-import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
-import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
-import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import org.apache.isis.metamodel.services.title.TitleServiceDefault;
+import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
+import org.apache.isis.core.metamodel.facets.MethodRemoverConstants;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
+import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
+import org.apache.isis.core.metamodel.services.title.TitleServiceDefault;
 
 import lombok.val;
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
index 465a037..89e0342 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.annotation.Collection;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Mixin;
 import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.metamodel.facets.object.mixin.MixinFacet;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index 10ac73d..62dbb32 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -31,13 +31,13 @@ import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.annotation.ParameterLayout;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.metamodel.MetaModelContext_forTesting;
-import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
-import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
-import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
+import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
+import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
 
 import lombok.val;
 
diff --git a/core/metamodel/log4j2-test.xml b/core/metamodel/log4j2-test.xml
index e2f1c80..26dc93b 100644
--- a/core/metamodel/log4j2-test.xml
+++ b/core/metamodel/log4j2-test.xml
@@ -16,7 +16,7 @@
 	<Loggers>
 	
 	
-		<Logger name="org.apache.isis.metamodel.specloader.SpecificationLoaderDefault" level="warn" />
+		<Logger name="org.apache.isis.core.metamodel.specloader.SpecificationLoaderDefault" level="warn" />
 	
 		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
 		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
new file mode 100644
index 0000000..4b68215
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
@@ -0,0 +1,101 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import org.apache.isis.applib.IsisModuleApplib;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
+import org.apache.isis.core.metamodel.context.MetaModelContexts;
+import org.apache.isis.core.metamodel.objectmanager.ObjectManagerDefault;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
+import org.apache.isis.core.metamodel.specloader.InjectorMethodEvaluatorDefault;
+import org.apache.isis.core.metamodel.specloader.ProgrammingModelServiceDefault;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderDefault;
+import org.apache.isis.core.metamodel.services.ServiceInjectorDefault;
+import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory;
+import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault;
+import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorDefault;
+import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
+import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorForCollections;
+import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
+import org.apache.isis.core.metamodel.services.events.MetamodelEventSupport_Spring;
+import org.apache.isis.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault;
+import org.apache.isis.core.metamodel.services.grid.GridLoaderServiceDefault;
+import org.apache.isis.core.metamodel.services.grid.GridReaderUsingJaxb;
+import org.apache.isis.core.metamodel.services.grid.GridServiceDefault;
+import org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
+import org.apache.isis.core.metamodel.services.layout.LayoutServiceDefault;
+import org.apache.isis.core.metamodel.services.metamodel.MetaModelServiceDefault;
+import org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault;
+import org.apache.isis.core.metamodel.services.title.TitleServiceDefault;
+import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
+import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderDefault;
+import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderForCollections;
+import org.apache.isis.core.metamodel.valuetypes.ValueTypeRegistry;
+import org.apache.isis.security.api.IsisModuleSecurityApi;
+
+@Configuration
+@Import({
+        // modules
+        IsisModuleApplib.class,
+        IsisModuleCoreConfig.class,
+        IsisModuleSecurityApi.class,
+
+        // @Configuration's
+        MetaModelContexts.class,
+        MetamodelEventSupport_Spring.class,
+
+        // @Component's
+        ProgrammingModelInitFilterDefault.class,
+        ClassSubstitutorDefault.class,
+        ClassSubstitutorForCollections.class,
+        ClassSubstitutorRegistry.class,
+        ValueTypeProviderDefault.class,
+        ValueTypeProviderForCollections.class,
+        ValueTypeRegistry.class,
+
+        // @Service's
+        ObjectManagerDefault.class,
+        ServiceInjectorDefault.class,
+        ApplicationFeatureFactory.class,
+        MetamodelEventService.class,
+        ExceptionRecognizerDocDefault.class,
+        GridLoaderServiceDefault.class,
+        GridReaderUsingJaxb.class,
+        GridServiceDefault.class,
+        GridSystemServiceBS3.class,
+        InjectorMethodEvaluatorDefault.class,
+        LayoutServiceDefault.class,
+        MetaModelServiceDefault.class,
+        ProgrammingModelServiceDefault.class,
+        ServiceRegistryDefault.class,
+        TitleServiceDefault.class,
+        SpecificationLoaderDefault.class,
+        UserServiceDefault.class,
+        UserServiceDefault.SudoServiceSpi.class,
+
+        // @Repository's
+        ApplicationFeatureRepositoryDefault.class,
+
+})
+public class IsisModuleMetamodel {
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
new file mode 100644
index 0000000..963a1b2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter;
+
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
+
+/**
+ * Adapters to domain objects, where the application is written in terms of
+ * domain objects and those objects are represented within the NOF through these
+ * adapter, and not directly.
+ */
+public interface ObjectAdapter extends ManagedObject {
+
+    /**
+     * The object's unique {@link Oid}.
+     *
+     * <p>
+     * This id allows the object to added to, stored by,
+     * and retrieved from the object store.  Objects can be looked up by their
+     * {@link Oid}.
+     *
+     * <p>
+     * Note that standalone value objects ("foobar", or 5, or a date),
+     * are not mapped and have a <tt>null</tt> oid.
+     */
+    Oid getOid(); //XXX[2033] referenced by 'metamodel' only to create a bookmark (CommandUtil)
+
+//    /**
+//     * Returns either itself (if this is a root) or for parented collections, the
+//     * adapter corresponding to their {@link ParentedOid#getParentOid() root oid}.
+//     */
+//    ObjectAdapter getAggregateRoot(); //XXX[2033] not referenced by 'metamodel'
+
+    /**
+     * Whether this instance belongs to another object (meaning its
+     * {@link #getOid()} will be a {@link ParentedOid}).
+     */
+    default boolean isParentedCollection() {
+        return getOid() instanceof ParentedOid;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
new file mode 100644
index 0000000..a8b2f77
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.adapter;
+
+import javax.annotation.Nullable;
+
+/**
+ * 
+ * @since 2.0
+ *
+ */
+public interface ObjectAdapterProvider {
+
+    /**
+     * @return standalone (value) or root adapter
+     */
+    @Nullable ObjectAdapter adapterFor(@Nullable Object pojo);
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectNotFoundException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectNotFoundException.java
new file mode 100644
index 0000000..5a034b1
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectNotFoundException.java
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+/**
+ * Indicates that the <tt>PojoRecreator</tt> was unable to instantiate a new pojo for the specified
+ * {@link Oid}.
+ */
+public class ObjectNotFoundException extends ObjectPersistenceException {
+    private static final long serialVersionUID = 1L;
+
+    public ObjectNotFoundException(final Oid oid) {
+        super("Object not found in store with oid " + oid);
+    }
+
+    public ObjectNotFoundException(final Oid oid, final Throwable cause) {
+        super("Object not found in store with oid " + oid, cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectPersistenceException.java
new file mode 100644
index 0000000..42270ae
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ObjectPersistenceException.java
@@ -0,0 +1,42 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import org.apache.isis.core.commons.exceptions.IsisException;
+
+public class ObjectPersistenceException extends IsisException {
+    private static final long serialVersionUID = 1L;
+
+    public ObjectPersistenceException() {
+        super();
+    }
+
+    public ObjectPersistenceException(final String message) {
+        super(message);
+    }
+
+    public ObjectPersistenceException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    public ObjectPersistenceException(final Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
new file mode 100644
index 0000000..4e53f3f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -0,0 +1,140 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import java.io.Serializable;
+
+import org.apache.isis.applib.annotation.Value;
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+
+/**
+ * An immutable identifier for either a root object (subtype {@link RootOid}) or
+ * a parented collection (subtype {@link ParentedOid}).
+ *
+ * <p>
+ * Note that value objects (strings, ints, {@link Value}s etc) do not have an {@link Oid}.
+ */
+public interface Oid extends Serializable {
+
+    /**
+     * A string representation of this {@link Oid}.
+     */
+    String enString();
+
+    /**
+     * Flags whether this OID is for a transient (not-yet-persisted) object,
+     * or a view model object, or for a persistent object.
+     *
+     * <p>
+     * In the case of an {@link ParentedOid}, is determined by the state
+     * of its {@link ParentedOid#getParentOid() root}'s {@link RootOid#isTransient() state}.
+     */
+    boolean isTransient();
+
+    boolean isViewModel();
+
+    boolean isPersistent();
+
+    default boolean isValue() {
+        return false; // default, only overridden by Oid_Value
+    }
+    
+    /**
+     * {@link ObjectSpecId} of the domain object this instance is representing, or when parented,
+     * the ObjectSpecId of the parent domain object. When representing a value returns {@code null}.   
+     */
+    ObjectSpecId getObjectSpecId();
+
+    // -- MARSHALLING
+
+    public static interface Marshaller {
+
+        String marshal(ParentedOid parentedOid);
+
+        String marshal(RootOid rootOid);
+
+        String joinAsOid(String domainType, String instanceId);
+
+    }
+
+    public static Marshaller marshaller() {
+        return Oid_Marshaller.INSTANCE;
+    }
+
+    // -- UN-MARSHALLING
+
+    public static interface Unmarshaller {
+
+        <T extends Oid> T unmarshal(String oidStr, Class<T> requestedType);
+
+        String splitInstanceId(String oidStr);
+
+    }
+
+    public static Unmarshaller unmarshaller() {
+        return Oid_Marshaller.INSTANCE;
+    }
+
+    // -- FACTORIES
+
+    /** for convenience*/
+    public static final class Factory {
+
+        public static RootOid value() {
+            return Oid_Value.INSTANCE;
+        }
+
+        // -- LEGACY
+
+        public static RootOid ofBookmark(Bookmark bookmark) {
+            return Oid_Root.of(
+                    ObjectSpecId.of(bookmark.getObjectType()), 
+                    bookmark.getIdentifier(), 
+                    bookmark.getObjectState());
+        }
+
+        public static RootOid viewmodelOf(ObjectSpecId objectSpecId, String mementoStr) {
+            return Oid_Root.of(objectSpecId, mementoStr, Bookmark.ObjectState.VIEW_MODEL);
+        }
+
+        public static RootOid transientOf(ObjectSpecId objectSpecId, String identifier) {
+            return Oid_Root.of(objectSpecId, identifier, Bookmark.ObjectState.TRANSIENT);
+        }
+
+        public static RootOid persistentOf(ObjectSpecId objectSpecId, String identifier) {
+            return Oid_Root.of(objectSpecId, identifier, Bookmark.ObjectState.PERSISTENT);
+        }
+
+        // -- PARENTED COLLECTIONS
+
+        public static ParentedOid parentedOfOneToMany(RootOid parentRootOid, OneToManyAssociation oneToMany) {
+            return Oid_Parented.ofOneToManyId(parentRootOid, oneToMany.getId());
+        }
+
+        public static ParentedOid parentedOfOneToManyId(RootOid parentRootOid, String oneToManyId) {
+            return Oid_Parented.ofOneToManyId(parentRootOid, oneToManyId);
+        }
+        
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
new file mode 100644
index 0000000..d7512f5
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
@@ -0,0 +1,254 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+
+import static org.apache.isis.core.commons.internal.base._Strings.splitThenStream;
+
+/**
+ * Factory for subtypes of {@link Oid}, based on their oid str.
+ *
+ * <p>
+ * Examples
+ * <dl>
+ * <dt>CUS:123</dt>
+ * <dd>persistent root</dd>
+ * <dt>!CUS:123</dt>
+ * <dd>transient root</dd>
+ * <dt>*CUS:123</dt>
+ * <dd>view model root</dd>
+ * <dt>CUS:123$items</dt>
+ * <dd>collection of persistent root</dd>
+ * <dt>!CUS:123$items</dt>
+ * <dd>collection of transient root</dd>
+ * <dt>CUS:123~NME:2</dt>
+ * <dd>aggregated object within persistent root</dd>
+ * <dt>!CUS:123~NME:2</dt>
+ * <dd>aggregated object within transient root</dd>
+ * <dt>CUS:123~NME:2~CTY:LON</dt>
+ * <dd>aggregated object within aggregated object within root</dd>
+ * <dt>CUS:123~NME:2$items</dt>
+ * <dd>collection of an aggregated object within root</dd>
+ * <dt>CUS:123~NME:2~CTY:LON$streets</dt>
+ * <dd>collection of an aggregated object within aggregated object within root</dd>
+ * </dl>
+ *
+ * <p>
+ * Separators:
+ * <dl>
+ * <dt>!</dt>
+ * <dd>precedes root object type, indicates transient</dd>
+ * <dt>*</dt>
+ * <dd>precedes root object type, indicates transient</dd>
+ * <dt>:</dt>
+ * <dd>precedes root object identifier</dd>
+ * <dt>~</dt>
+ * <dd>precedes aggregate oid</dd>
+ * <dt>$</dt>
+ * <dd>precedes collection name</dd>
+ * <dt>^</dt>
+ * <dd>precedes version</dd>
+ * </dl>
+ *
+ * <p>
+ * Note that # and ; were not chosen as separators to minimize noise when URL encoding OIDs.
+ */
+final class Oid_Marshaller implements Oid.Marshaller, Oid.Unmarshaller {
+
+    public final static Oid_Marshaller INSTANCE = new Oid_Marshaller();
+
+    private Oid_Marshaller(){}
+
+    // -- public constants
+    public static final String VIEWMODEL_INDICATOR =
+            Bookmark.ObjectState.VIEW_MODEL.getCode(); // "*"
+
+
+    // -- private constants
+    private static final String TRANSIENT_INDICATOR =
+            Bookmark.ObjectState.TRANSIENT.getCode() ; // "!"
+
+    private static final String SEPARATOR = ":";
+    private static final String SEPARATOR_NESTING = "~";
+    private static final String SEPARATOR_PARENTED = "$";
+    private static final String SEPARATOR_VERSION = "^"; // legacy
+
+    private static final String WORD = "[^" + SEPARATOR + SEPARATOR_NESTING + SEPARATOR_PARENTED + "\\" + SEPARATOR_VERSION + "#" + "]+";
+
+    private static final String WORD_GROUP = "(" + WORD + ")";
+
+    private static Pattern OIDSTR_PATTERN =
+            Pattern.compile(
+                    "^(" +
+                            "(" +
+                            "([" + TRANSIENT_INDICATOR + VIEWMODEL_INDICATOR + "])?" +
+                            WORD_GROUP + SEPARATOR + WORD_GROUP +
+                            ")" +
+                            "(" +
+                            "(" + SEPARATOR_NESTING + WORD + SEPARATOR + WORD + ")*" + // nesting of aggregates
+                            ")" +
+                            ")" +
+                            "(" + "[" + SEPARATOR_PARENTED + "]" + WORD + ")?"  + // optional collection name
+                            "([\\" + SEPARATOR_VERSION + "].*)?" + // to be compatible with previous patterns, that optionally included version information
+                    "$");
+
+
+    // -- join, split
+
+    @Override //implementing Oid.Marshaller
+    public String joinAsOid(String domainType, String instanceId) {
+        return domainType + SEPARATOR + instanceId;
+    }
+
+    @Override //implementing Oid.Unarshaller
+    public String splitInstanceId(String oidStr) {
+        final int indexOfSeperator = oidStr.indexOf(SEPARATOR);
+        return indexOfSeperator > 0? oidStr.substring(indexOfSeperator+1): null;
+    }
+
+
+
+    // -- unmarshal
+
+    @Override
+    public <T extends Oid> T unmarshal(String oidStr, Class<T> requestedType) {
+
+        final Matcher matcher = OIDSTR_PATTERN.matcher(oidStr);
+        if (!matcher.matches()) {
+            throw _Exceptions.illegalArgument("Could not parse OID '" + oidStr + "'; should match pattern: " + OIDSTR_PATTERN.pattern());
+        }
+
+        final String isTransientOrViewModelStr = getGroup(matcher, 3);
+        final Bookmark.ObjectState state;
+        if("!".equals(isTransientOrViewModelStr)) {
+            state = Bookmark.ObjectState.TRANSIENT;
+        } else if("*".equals(isTransientOrViewModelStr)) {
+            state = Bookmark.ObjectState.VIEW_MODEL;
+        } else {
+            state = Bookmark.ObjectState.PERSISTENT;
+        }
+
+        final String rootObjectType = getGroup(matcher, 4);
+        final String rootIdentifier = getGroup(matcher, 5);
+
+        final String aggregateOidPart = getGroup(matcher, 6);
+        final List<AggregateOidPart> aggregateOidParts = _Lists.newArrayList();
+        
+        if(aggregateOidPart != null) {
+            final Stream<String> tildaSplitted = splitThenStream(aggregateOidPart, SEPARATOR_NESTING); 
+
+            tildaSplitted.forEach(str->{
+                if(_Strings.isNullOrEmpty(str)) {
+                    return; // leading "~"
+                }
+                final Iterator<String> colonSplitIter = splitThenStream(str, SEPARATOR).iterator();
+                final String objectType = colonSplitIter.next();
+                final String localId = colonSplitIter.next();
+                aggregateOidParts.add(new AggregateOidPart(objectType, localId));
+            });
+
+        }
+        final String collectionPart = getGroup(matcher, 8);
+        final String oneToManyId = collectionPart != null ? collectionPart.substring(1) : null;
+
+        if(oneToManyId == null) {
+            if(aggregateOidParts.isEmpty()) {
+                ensureCorrectType(oidStr, requestedType, RootOid.class);
+                return _Casts.uncheckedCast(
+                        Oid_Root.of(ObjectSpecId.of(rootObjectType), rootIdentifier, state));
+            } else {
+                throw _Exceptions.illegalArgument("Aggregated Oids are no longer supported");
+            }
+        } else {
+            final String oidStrWithoutCollectionName = getGroup(matcher, 1);
+
+            final String parentOidStr = oidStrWithoutCollectionName;
+
+            RootOid parentOid = this.unmarshal(parentOidStr, RootOid.class);
+            ensureCorrectType(oidStr, requestedType, ParentedOid.class);
+            return _Casts.uncheckedCast( Oid_Parented.ofOneToManyId(parentOid, oneToManyId) );
+        }
+    }
+
+
+
+    private static class AggregateOidPart {
+        AggregateOidPart(String objectType, String localId) {
+            this.objectType = objectType;
+            this.localId = localId;
+        }
+        String objectType;
+        String localId;
+        @Override
+        public String toString() {
+            return SEPARATOR_NESTING + objectType + SEPARATOR + localId;
+        }
+    }
+
+
+    private <T> void ensureCorrectType(String oidStr, Class<T> requestedType, 
+            final Class<? extends Oid> actualType) {
+
+        if(!requestedType.isAssignableFrom(actualType)) {
+            throw new IllegalArgumentException(
+                    String.format("OID '%s' was unmarshealled to type '%s' which cannot be assigned "
+                            + "to requested type '%s'",
+                            oidStr, actualType.getSimpleName(), requestedType.getSimpleName()) );
+        }
+    }
+
+    private String getGroup(final Matcher matcher, final int group) {
+        final int groupCount = matcher.groupCount();
+        if(group > groupCount) {
+            return null;
+        }
+        final String val = matcher.group(group);
+        return _Strings.emptyToNull(val);
+    }
+
+
+    // -- marshal
+    @Override
+    public final String marshal(RootOid rootOid) {
+        _Assert.assertFalse("can not marshal values", rootOid.isValue());
+        final String transientIndicator = rootOid.isTransient()? TRANSIENT_INDICATOR : "";
+        final String viewModelIndicator = rootOid.isViewModel()? VIEWMODEL_INDICATOR : "";
+        return transientIndicator + viewModelIndicator + rootOid.getObjectSpecId() + SEPARATOR + rootOid.getIdentifier();
+    }
+
+    @Override
+    public String marshal(ParentedOid parentedOid) {
+        return parentedOid.getParentOid().enString() + SEPARATOR_PARENTED + parentedOid.getName();
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
new file mode 100644
index 0000000..551d207
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
@@ -0,0 +1,146 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import java.io.IOException;
+import java.util.Objects;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+
+final class Oid_Parented implements ParentedOid {
+
+    private static final long serialVersionUID = 1L;
+
+    private final String oneToManyId;
+    private final int hashCode;
+
+    private final RootOid parentRootOid;
+
+    static Oid_Parented ofOneToManyId(RootOid parentRootOid, String oneToManyId) {
+        return new Oid_Parented(parentRootOid, oneToManyId);
+    }
+
+    private Oid_Parented(RootOid parentRootOid, String oneToManyId) {
+        requires(parentRootOid, "parentRootOid");
+        this.parentRootOid = parentRootOid;
+        this.oneToManyId = oneToManyId;
+        this.hashCode = calculateHash();
+    }
+
+    @Override
+    public RootOid getParentOid() {
+        return parentRootOid;
+    }
+    
+    @Override
+    public ObjectSpecId getObjectSpecId() {
+        return getParentOid().getObjectSpecId();
+    }
+
+    @Override
+    public boolean isTransient() {
+        return getParentOid().isTransient();
+    }
+
+    @Override
+    public boolean isViewModel() {
+        return getParentOid().isViewModel();
+    }
+
+    @Override
+    public boolean isPersistent() {
+        return getParentOid().isPersistent();
+    }
+
+    public static Oid_Parented deString(String oidStr) {
+        return unmarshaller().unmarshal(oidStr, Oid_Parented.class);
+    }
+
+    @Override
+    public String enString() {
+        return marshaller().marshal(this);
+    }
+
+    private Oid_Parented(Oid_Parented oid) throws IOException {
+        this.parentRootOid = oid.getParentOid();
+        this.oneToManyId = oid.oneToManyId;
+        this.hashCode = calculateHash();
+    }
+
+    @Override
+    public String getName() {
+        return oneToManyId;
+    }
+
+
+    // /////////////////////////////////////////////////////////
+    // toString
+    // /////////////////////////////////////////////////////////
+
+    @Override
+    public String toString() {
+        return enString();
+    }
+
+    // /////////////////////////////////////////////////////////
+    // Value semantics
+    // /////////////////////////////////////////////////////////
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (other == null) {
+            return false;
+        }
+        if (getClass() != other.getClass()) {
+            return false;
+        }
+        return equals((Oid_Parented) other);
+    }
+
+    public boolean equals(final Oid_Parented other) {
+        return Objects.equals(other.getParentOid(), getParentOid()) 
+                && Objects.equals(other.oneToManyId, oneToManyId);
+    }
+
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    private int calculateHash() {
+        return Objects.hash(getParentOid(), oneToManyId);
+    }
+
+    /**
+     * When the RootOid is persisted, all its &quot;children&quot;
+     * need updating similarly.
+     */
+    public Oid_Parented asPersistent(RootOid newParentRootOid) {
+        return new Oid_Parented(newParentRootOid, oneToManyId);
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
new file mode 100644
index 0000000..ff270c4
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
@@ -0,0 +1,167 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import java.util.Objects;
+
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.schema.common.v1.BookmarkObjectState;
+import org.apache.isis.schema.common.v1.OidDto;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+
+import lombok.val;
+
+final class Oid_Root implements RootOid {
+
+    private final static long serialVersionUID = 2L;
+
+    private final ObjectSpecId objectSpecId;
+    private final String identifier;
+    private final Bookmark.ObjectState state;
+    private final int hashCode;
+
+    public static Oid_Root of(
+            ObjectSpecId objectSpecId, 
+            String identifier, 
+            Bookmark.ObjectState state) {
+
+        return new Oid_Root(objectSpecId, identifier, state);
+    }
+
+    private Oid_Root(ObjectSpecId objectSpecId, String identifier, Bookmark.ObjectState state) {
+
+        requires(objectSpecId, "objectSpecId");
+        requires(identifier, "identifier");
+        requires(state, "state");
+
+        this.objectSpecId = objectSpecId;
+        this.identifier = identifier;
+        this.state = state;
+        this.hashCode = calculateHash();
+
+    }
+
+    // -- deString'able, enString
+    public static Oid_Root deStringEncoded(final String urlEncodedOidStr) {
+        final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
+        return deString(oidStr);
+    }
+
+    public static Oid_Root deString(final String oidStr) {
+        return Oid.unmarshaller().unmarshal(oidStr, Oid_Root.class);
+    }
+
+    @Override
+    public String enString() {
+        return Oid.marshaller().marshal(this);
+    }
+
+    // -- Properties
+    @Override
+    public ObjectSpecId getObjectSpecId() {
+        return objectSpecId;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    @Override
+    public boolean isTransient() {
+        return state == Bookmark.ObjectState.TRANSIENT;
+    }
+
+    @Override
+    public boolean isViewModel() {
+        return state == Bookmark.ObjectState.VIEW_MODEL;
+    }
+
+    @Override
+    public boolean isPersistent() {
+        return state == Bookmark.ObjectState.PERSISTENT;
+    }
+
+    @Override
+    public Bookmark asBookmark() {
+        val objectType = state.getCode() + getObjectSpecId().asString();
+        val identifier = getIdentifier();
+        return new Bookmark(objectType, identifier);
+    }
+
+    @Override
+    public OidDto asOidDto() {
+
+        val oidDto = new OidDto();
+
+        oidDto.setType(getObjectSpecId().asString());
+        oidDto.setId(getIdentifier());
+
+        val bookmarkState = state.toBookmarkState();
+        oidDto.setObjectState(
+                bookmarkState != BookmarkObjectState.PERSISTENT 
+                ? bookmarkState  
+                        : null); // persistent is assumed if not specified...
+
+        return oidDto;
+    }
+
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other == null) {
+            return false;
+        }
+        if (other == this) {
+            return true;
+        }
+        if (getClass() != other.getClass()) {
+            return false;
+        }
+        return equals((Oid_Root) other);
+    }
+
+    public boolean equals(final Oid_Root other) {
+        return Objects.equals(objectSpecId, other.getObjectSpecId()) 
+                && Objects.equals(identifier, other.getIdentifier())
+                && Objects.equals(state, other.state);
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    @Override
+    public String toString() {
+        return enString();
+    }
+
+    // -- HELPER
+
+    private int calculateHash() {
+        return Objects.hash(objectSpecId, identifier, state);
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
new file mode 100644
index 0000000..e14ee9b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
@@ -0,0 +1,87 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.schema.common.v1.OidDto;
+
+final class Oid_Value implements RootOid {
+
+    private final static long serialVersionUID = 1L;
+
+    static final Oid_Value INSTANCE = new Oid_Value();
+
+    @Override
+    public String enString() {
+        return null;
+    }
+
+    @Override
+    public boolean isValue() { 
+        return true; 
+    }
+
+    @Override
+    public boolean isTransient() {
+        return false;
+    }
+
+    @Override
+    public boolean isViewModel() {
+        return false;
+    }
+
+    @Override
+    public boolean isPersistent() {
+        return false;
+    }
+
+    @Override
+    public ObjectSpecId getObjectSpecId() {
+        return null;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "VALUE_OID";
+    }
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
+    @Override
+    public Bookmark asBookmark() {
+        return null;
+    }
+
+    @Override
+    public OidDto asOidDto() {
+        return null;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
new file mode 100644
index 0000000..f721fba
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
@@ -0,0 +1,54 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+/**
+ * Used as the {@link Oid} for {@link OneToManyAssociation} (collections).
+ */
+public interface ParentedOid extends Oid {
+
+    /**
+     * object identifier of the domain object that is holding the {@link OneToManyAssociation}
+     * this instance is representing
+     */
+    RootOid getParentOid();
+
+    /**
+     * id of the {@link OneToManyAssociation} this instance is representing, that is 
+     * the member name, that is annotated with {@link Collection}
+     */
+    String getName();
+
+    // -- DECODE FROM STRING
+
+    public static ParentedOid deStringEncoded(final String urlEncodedOidStr) {
+        final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
+        return deString(oidStr);
+    }
+
+    public static ParentedOid deString(String enString) {
+        return unmarshaller().unmarshal(enString, ParentedOid.class);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRecreationException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRecreationException.java
new file mode 100644
index 0000000..f9bba6c
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRecreationException.java
@@ -0,0 +1,29 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+public class PojoRecreationException extends ObjectPersistenceException {
+    private static final long serialVersionUID = 1L;
+
+    public PojoRecreationException(Oid oid, Throwable cause) {
+        super("Could not recreate pojo for oid oid " + oid, cause);
+
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRefreshException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRefreshException.java
new file mode 100644
index 0000000..71be982
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/PojoRefreshException.java
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+public class PojoRefreshException extends ObjectNotFoundException {
+    private static final long serialVersionUID = 1L;
+
+    public PojoRefreshException(Oid oid) {
+        super(oid);
+    }
+
+    public PojoRefreshException(Oid oid, Throwable cause) {
+        super(oid, cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
new file mode 100644
index 0000000..4c951b3
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
@@ -0,0 +1,46 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.adapter.oid;
+
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.schema.common.v1.OidDto;
+
+public interface RootOid extends Oid {
+
+    String getIdentifier();
+
+    Bookmark asBookmark();
+
+    OidDto asOidDto();
+
+    // -- DECODE FROM STRING
+
+    public static RootOid deStringEncoded(final String urlEncodedOidStr) {
+        final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
+        return deString(oidStr);
+    }
+
+    public static RootOid deString(final String oidStr) {
+        return Oid.unmarshaller().unmarshal(oidStr, RootOid.class);
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java
new file mode 100644
index 0000000..53c74ca
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * Defines {@link org.apache.isis.core.metamodel.adapter.ObjectAdapter} interface,
+ * a wrapper around each domain object pojo.
+ *
+ * <p>
+ * {@link org.apache.isis.core.metamodel.adapter.ObjectAdapter} is analogous
+ * to {@link java.lang.Object java.lang.Object}; from it the {@link org.apache.isis.core.metamodel.spec.ObjectSpecification}
+ * can be obtained (analogous to {@link java.lang.Class java.lang.Class}.
+ *
+ * <p>
+ * The other significant type defined by
+ */
+package org.apache.isis.core.metamodel.adapter;
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacet.java
new file mode 100644
index 0000000..72a6564
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacet.java
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.authorization.standard;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
+
+/**
+ * Optionally hide or disable an object, property, collection or action
+ * depending on the authorization.
+ */
+public interface AuthorizationFacet extends Facet, HidingInteractionAdvisor, DisablingInteractionAdvisor {
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
new file mode 100644
index 0000000..6f569c9
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
@@ -0,0 +1,78 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.authorization.standard;
+
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
+@Log4j2
+public abstract class AuthorizationFacetAbstract extends FacetAbstract implements AuthorizationFacet {
+
+    public static Class<? extends Facet> type() {
+        return AuthorizationFacet.class;
+    }
+
+    private final AuthorizationManager authorizationManager;
+
+    public AuthorizationFacetAbstract(
+            final FacetHolder holder) {
+        super(type(), holder, Derivation.NOT_DERIVED);
+        this.authorizationManager = getAuthorizationManager();
+    }
+
+    @Override
+    public String hides(VisibilityContext<? extends VisibilityEvent> ic) {
+        
+        val hides = authorizationManager.isVisible(getAuthenticationSession(), ic.getIdentifier()) 
+                ? null 
+                        : "Not authorized to view";
+        
+        if(hides!=null && log.isDebugEnabled()) {
+            log.debug("hides[{}] -> {}", ic.getIdentifier(), hides);
+        }
+        
+        return hides;
+    }
+
+    @Override
+    public String disables(UsabilityContext<? extends UsabilityEvent> ic) {
+        
+        val disables = authorizationManager.isUsable(getAuthenticationSession(), ic.getIdentifier()) 
+                ? null 
+                        : "Not authorized to edit";
+        
+        if(disables!=null && log.isDebugEnabled()) {
+            log.debug("disables[{}] -> {}", ic.getIdentifier(), disables);
+        }
+        
+        return disables;
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetFactory.java
new file mode 100644
index 0000000..3f7d04f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetFactory.java
@@ -0,0 +1,46 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.authorization.standard;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+
+public class AuthorizationFacetFactory extends FacetFactoryAbstract {
+
+    public AuthorizationFacetFactory() {
+        super(FeatureType.EVERYTHING_BUT_PARAMETERS);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContext) {
+        super.addFacet(createFacet(processClassContext.getFacetHolder()));
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        super.addFacet(createFacet(processMethodContext.getFacetHolder()));
+    }
+
+    private AuthorizationFacetImpl createFacet(final FacetHolder holder) {
+        return new AuthorizationFacetImpl(holder);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetImpl.java
new file mode 100644
index 0000000..2a419c3
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetImpl.java
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.authorization.standard;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
+public class AuthorizationFacetImpl extends AuthorizationFacetAbstract {
+
+    public AuthorizationFacetImpl(final FacetHolder holder) {
+        super(holder);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
new file mode 100644
index 0000000..ea27f71
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
@@ -0,0 +1,33 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * Authorization API..
+ *
+ * <p>
+ * Used in two different ways:
+ * <ul>
+ * <li>in prototyping or single user, used by the {@link org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
+ *     implementations, that is, enforcing authorization on the "client-side".
+ *     </li>
+ * <li>In client/server mode, used by a {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
+ *     that is, enforcing authorization by delegating to the "server-side".</li>
+ * </ul>
+ */
+package org.apache.isis.core.metamodel.authorization.standard;
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
new file mode 100644
index 0000000..a9882b3
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
@@ -0,0 +1,69 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.isis.core.commons.exceptions.IsisException;
+
+public final class ArrayExtensions {
+
+    private ArrayExtensions() {
+    }
+
+    static Object[] convertPrimitiveToObjectArray(final Object extendee, final Class<?> arrayType) {
+        Object[] convertedArray;
+        try {
+            final Class<?> wrapperClass = ClassExtensions.asWrapped(arrayType);
+            final Constructor<?> constructor = wrapperClass.getConstructor(new Class[] { String.class });
+            final int len = Array.getLength(extendee);
+            convertedArray = (Object[]) Array.newInstance(wrapperClass, len);
+            for (int i = 0; i < len; i++) {
+                convertedArray[i] = constructor.newInstance(new Object[] { Array.get(extendee, i).toString() });
+            }
+        } catch (final NoSuchMethodException e) {
+            throw new IsisException(e);
+        } catch (final ArrayIndexOutOfBoundsException e) {
+            throw new IsisException(e);
+        } catch (final IllegalArgumentException e) {
+            throw new IsisException(e);
+        } catch (final InstantiationException e) {
+            throw new IsisException(e);
+        } catch (final IllegalAccessException e) {
+            throw new IsisException(e);
+        } catch (final InvocationTargetException e) {
+            throw new IsisException(e);
+        }
+        return convertedArray;
+    }
+
+    public static Object[] asCharToCharacterArray(final Object extendee) {
+        final char[] original = (char[]) extendee;
+        final int len = original.length;
+        final Character[] converted = new Character[len];
+        for (int i = 0; i < converted.length; i++) {
+            converted[i] = Character.valueOf(original[i]);
+        }
+        return converted;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanBeVoid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanBeVoid.java
new file mode 100644
index 0000000..29f1c81
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanBeVoid.java
@@ -0,0 +1,25 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+public enum CanBeVoid {
+    TRUE,
+    FALSE
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
new file mode 100644
index 0000000..587951b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
@@ -0,0 +1,175 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.resources._Resources;
+
+import lombok.val;
+
+public final class ClassExtensions {
+
+
+    private ClassExtensions() {
+    }
+
+    public static Object newInstance(final Class<?> extendee, final Class<?> constructorParamType, final Object constructorArg) {
+        return ClassExtensions.newInstance(extendee, new Class[] { constructorParamType }, new Object[] { constructorArg });
+    }
+
+    /**
+     * Tries to instantiate using a constructor accepting the supplied
+     * arguments; if no such constructor then falls back to trying the no-arg
+     * constructor.
+     */
+    public static Object newInstance(final Class<?> extendee, final Class<?>[] constructorParamTypes, final Object[] constructorArgs) {
+        try {
+            Constructor<?> constructor;
+            try {
+                constructor = extendee.getConstructor(constructorParamTypes);
+                return constructor.newInstance(constructorArgs);
+            } catch (final NoSuchMethodException ex) {
+                try {
+                    constructor = extendee.getConstructor();
+                    return constructor.newInstance();
+                } catch (final NoSuchMethodException e) {
+                    val msg = String.format("Failed to call contructor for type %s trying, "
+                            + "args '%s' then trying no args.",
+                            extendee.getName(),
+                            _Lists.of(constructorParamTypes).toString());
+
+                    throw _Exceptions.unrecoverable(msg, e);
+                }
+            }
+        } catch (final SecurityException | IllegalArgumentException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
+            throw new IsisException(ex);
+        }
+    }
+
+    public static String getSuperclass(final Class<?> extendee) {
+        final Class<?> superType = extendee.getSuperclass();
+
+        if (superType == null) {
+            return null;
+        }
+        return superType.getName();
+    }
+
+    public static boolean isAbstract(final Class<?> extendee) {
+        return Modifier.isAbstract(extendee.getModifiers());
+    }
+
+    public static boolean isJavaClass(final Class<?> extendee) {
+        final String className = extendee.getName();
+        return className.startsWith(ClassUtil.JAVA_CLASS_PREFIX) ||
+                extendee.getName().startsWith("sun.");
+    }
+
+    static Class<?> implementingClassOrNull(final Class<?> extendee, final Class<?> requiredClass, final Class<?> constructorParamType) {
+        if (extendee == null) {
+            return null;
+        }
+        if (!requiredClass.isAssignableFrom(extendee)) {
+            return null;
+        }
+        try {
+            extendee.getConstructor(new Class[] { constructorParamType });
+        } catch (final NoSuchMethodException ex) {
+            try {
+                extendee.getConstructor(new Class[] {});
+            } catch (final NoSuchMethodException e) {
+                return null;
+            }
+        } catch (final SecurityException e) {
+            return null;
+        }
+        final int modifiers = extendee.getModifiers();
+        if (!Modifier.isPublic(modifiers)) {
+            return null;
+        }
+        return extendee;
+    }
+
+    public static Method getMethod(final Class<?> clazz, final String methodName, final Class<?>... parameterClass) throws NoSuchMethodException {
+        return clazz.getMethod(methodName, parameterClass);
+    }
+
+    public static Method getMethodElseNull(final Class<?> clazz, final String methodName, final Class<?>... parameterClass) {
+        try {
+            return clazz.getMethod(methodName, parameterClass);
+        } catch (final NoSuchMethodException e) {
+            return null;
+        }
+    }
+
+    public static boolean exists(final Class<?> cls, final String resourceName) {
+        final URL url = _Resources.getResourceUrl(cls, resourceName);
+        return url != null;
+    }
+
+    static Class<?> asWrapped(final Class<?> primitiveClassExtendee) {
+        return ClassUtil.wrapperClasses.get(primitiveClassExtendee);
+    }
+
+    public static Class<? extends Object> asWrappedIfNecessary(final Class<?> cls) {
+        return cls.isPrimitive() ? asWrapped(cls) : cls;
+    }
+
+    public static Object toDefault(final Class<?> extendee) {
+        if(!extendee.isPrimitive()) {
+            return null;
+        }
+        return ClassUtil.defaultByPrimitiveClass.get(extendee);
+    }
+
+    /**
+     * Returns the corresponding 'null' value for the primitives, or just
+     * <tt>null</tt> if the class represents a non-primitive type.
+     */
+    public static Object getNullOrDefault(final Class<?> type) {
+        return ClassUtil.defaultByPrimitiveType.get(type);
+    }
+
+    public static boolean isCompatibleAsReturnType(final Class<?> returnTypeExtendee, final CanBeVoid canBeVoid, final Class<?> type) {
+        boolean mayBeVoid = canBeVoid == CanBeVoid.TRUE;
+
+        if (returnTypeExtendee == null) {
+            return true;
+        }
+        if (mayBeVoid && (type == void.class)) {
+            return true;
+        }
+
+        if (type.isPrimitive()) {
+            return returnTypeExtendee.isAssignableFrom(ClassUtil.wrapperClasses.get(type));
+        }
+
+        return (returnTypeExtendee.isAssignableFrom(type));
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassFunctions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassFunctions.java
new file mode 100644
index 0000000..f9252e0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassFunctions.java
@@ -0,0 +1,46 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+
+public final class ClassFunctions {
+
+    private ClassFunctions(){}
+
+    public static <T> Function<Object, T> castTo(final Class<T> type) {
+        return new Function<Object, T>() {
+            @SuppressWarnings("unchecked")
+            @Override
+            public T apply(final Object input) {
+                return (T) input;
+            }
+        };
+    }
+
+    public static Function<Class<?>, String> packageNameOf() {
+        return new Function<Class<?>, String>() {
+            @Nullable @Override public String apply(final Class<?> input) {
+                return input.getPackage().getName();
+            }
+        };
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassPredicates.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassPredicates.java
new file mode 100644
index 0000000..88c3c03
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassPredicates.java
@@ -0,0 +1,37 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.function.Predicate;
+
+public final class ClassPredicates {
+
+    private ClassPredicates(){}
+
+    public static final <T> Predicate<Object> isOfType(final Class<T> type) {
+        return new Predicate<Object>() {
+            @Override
+            public boolean test(Object input) {
+                return type.isAssignableFrom(input.getClass());
+            }
+        };
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
new file mode 100644
index 0000000..a6a7183
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
@@ -0,0 +1,192 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
+
+import lombok.val;
+
+public final class ClassUtil {
+
+    static final String JAVA_CLASS_PREFIX = "java.";
+
+    private static Map<String, Class<?>> builtInClasses = new HashMap<String, Class<?>>();
+
+    static {
+        put(void.class);
+        put(boolean.class);
+        put(char.class);
+        put(byte.class);
+        put(short.class);
+        put(int.class);
+        put(long.class);
+        put(float.class);
+        put(double.class);
+    }
+
+    private static void put(final Class<?> cls) {
+        builtInClasses.put(cls.getName(), cls);
+    }
+
+    static final Map<Class<?>, Object> defaultByPrimitiveClass =
+            MapUtil.asMap(
+                    boolean.class, false,
+                    byte.class, (byte)0,
+                    short.class, (short)0,
+                    int.class, 0,
+                    long.class, 0L,
+                    float.class, 0.0f,
+                    double.class, 0.0,
+                    char.class, (char)0
+                    );
+    static Map<Class<?>, Class<?>> wrapperClasses =
+            MapUtil.asMap(
+                    // TODO: there is a better way of doing this in 1.6 using TypeMirror
+                    boolean.class, Boolean.class,
+                    byte.class, Byte.class,
+                    char.class, Character.class,
+                    short.class, Short.class,
+                    int.class, Integer.class,
+                    long.class, Long.class,
+                    float.class, Float.class,
+                    double.class, Double.class,
+                    void.class, Void.class
+                    );
+
+    static Map<Class<?>, Object> defaultByPrimitiveType = new HashMap<Class<?>, Object>();
+
+    static {
+        defaultByPrimitiveType.put(byte.class, (byte) 0);
+        defaultByPrimitiveType.put(short.class, (short) 0);
+        defaultByPrimitiveType.put(int.class, 0);
+        defaultByPrimitiveType.put(long.class, 0L);
+        defaultByPrimitiveType.put(char.class, 0);
+        defaultByPrimitiveType.put(float.class, 0.0F);
+        defaultByPrimitiveType.put(double.class, 0.0);
+        defaultByPrimitiveType.put(boolean.class, false);
+    }
+
+    public static Map<String, Class<?>> primitives = _Maps.newHashMap();
+
+    static {
+        @SuppressWarnings({ "rawtypes" })
+        final List<Class> primitiveClasses = Arrays.<Class> asList(
+                boolean.class,
+                byte.class,
+                short.class,
+                int.class,
+                long.class,
+                float.class,
+                double.class,
+                char.class);
+        for (final Class<?> cls : primitiveClasses) {
+            primitives.put(cls.getName(), cls);
+        }
+    }
+
+
+    // //////////////////////////////////////
+
+    private ClassUtil() {
+    }
+
+    public static Class<?> getBuiltIn(final String name) {
+        return builtInClasses.get(name);
+    }
+
+    /**
+     * Returns the supplied Class so long as it implements (or is a subclass of)
+     * the required class, and also has either a constructor accepting the
+     * specified param type, or has a no-arg constructor.
+     */
+    public static Class<?> implementingClassOrNull(final String classCandidateName, final Class<?> requiredClass, final Class<?> constructorParamType) {
+        if (classCandidateName == null) {
+            return null;
+        }
+        Class<?> classCandidate = null;
+        try {
+            classCandidate = _Context.loadClass(classCandidateName);
+            return ClassExtensions.implementingClassOrNull(classCandidate, requiredClass, constructorParamType);
+        } catch (final ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+    public static boolean directlyImplements(final Class<?> cls, final Class<?> interfaceType) {
+        for (final Class<?> directlyImplementedInterface : cls.getInterfaces()) {
+            if (directlyImplementedInterface == interfaceType) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static Class<?> forNameElseFail(final String fullName) {
+        requiresNotEmpty(fullName, "fullName");
+        final Class<?> builtIn = ClassUtil.getBuiltIn(fullName);
+        if (builtIn != null) {
+            return builtIn;
+        }
+        try {
+            return _Context.loadClass(fullName);
+        } catch (final ClassNotFoundException e) {
+            throw _Exceptions.unrecoverable(e);
+        }
+    }
+
+    public static Class<?> forNameElseNull(final String fullName) {
+        if (_Strings.isNullOrEmpty(fullName)) {
+            return null;
+        }
+        try {
+            return _Context.loadClass(fullName);
+        } catch (final ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Returns {@code cls.getCanonicalName()} if present. 
+     * Otherwise resorts to fully qualified class-name, with any '$' replaced by '.$'.
+     * @param cls
+     * @return non-null
+     */
+    public static String getCanonicalName_friendlyToInnerClasses(Class<?> cls) {
+        requires(cls, "cls");
+
+        val name = cls.getCanonicalName();
+        if(name==null) {
+            return cls.getName().replace("$", ".$").replace("..", ".");
+        }
+        return name;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CloseableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CloseableExtensions.java
new file mode 100644
index 0000000..d3d420c
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CloseableExtensions.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.io.Closeable;
+
+public final class CloseableExtensions {
+
+    private CloseableExtensions() {
+    }
+
+    public static void closeSafely(final Closeable extendee) {
+        if (extendee != null) {
+            try {
+                extendee.close();
+            } catch (final Exception ignore) {
+                // ignore
+            }
+        }
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/DateExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/DateExtensions.java
new file mode 100644
index 0000000..dc759f4
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/DateExtensions.java
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+public final class DateExtensions {
+
+    private DateExtensions(){}
+
+    public static String asTimestamp(final Date date) {
+        final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd-hhmmssSSS");
+        return date == null ? "" : simpleDateFormat.format(date);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/InputStreamExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/InputStreamExtensions.java
new file mode 100644
index 0000000..75431ee
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/InputStreamExtensions.java
@@ -0,0 +1,69 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public final class InputStreamExtensions {
+
+    private static final int DEFAULT_BUFFER_SIZE = 1024;
+
+    private InputStreamExtensions() {
+    }
+
+    /**
+     * Copy bytes from an <code>InputStream</code> to an
+     * <code>OutputStream</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param extendee
+     *            the <code>InputStream</code> to read from
+     * @param output
+     *            the <code>OutputStream</code> to write to
+     * @return the number of bytes copied
+     * @throws IllegalArgumentException
+     *             if the input or output is null
+     * @throws IOException
+     *             if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static int copyTo(final InputStream extendee, final OutputStream output) throws IOException {
+        if (extendee == null) {
+            throw new IllegalArgumentException("InputStream cannot be null");
+        }
+        if (output == null) {
+            throw new IllegalArgumentException("OutputStream cannot be null");
+        }
+        final byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+        int count = 0;
+        int n = 0;
+        while (-1 != (n = extendee.read(buffer))) {
+            output.write(buffer, 0, n);
+            count += n;
+        }
+        return count;
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
new file mode 100644
index 0000000..68761af
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
@@ -0,0 +1,115 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
+
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
+
+public final class ListExtensions {
+    private static final String DEFAULT_DELIMITER = ",";
+
+    private ListExtensions() {
+    }
+
+    public static <T> List<T> combineWith(final List<T> extendee, final List<T> list2) {
+        final List<T> combinedList = _Lists.newArrayList();
+        combinedList.addAll(extendee);
+        combinedList.addAll(list2);
+        return combinedList;
+    }
+
+    /**
+     * Returns list1 with everything in list2, ignoring duplicates.
+     */
+    public static <T> List<T> mergeWith(final List<T> extendee, final List<T> list2) {
+        for (final T obj : list2) {
+            if (!(extendee.contains(obj))) {
+                extendee.add(obj);
+            }
+        }
+        return extendee;
+    }
+
+
+
+    /**
+     * @see #appendDelimitedStringToList(String, String, List)
+     */
+    public static List<String> appendDelimitedStringToList(final String commaSeparated, final List<String> list) {
+        return appendDelimitedStringToList(commaSeparated, DEFAULT_DELIMITER, list);
+    }
+
+    public static List<String> appendDelimitedStringToList(final String delimited, final String delimiter, final List<String> list) {
+        if (delimited == null) {
+            return list;
+        }
+        final String[] optionValues = delimited.split(delimiter);
+        list.addAll(Arrays.asList(optionValues));
+        return list;
+    }
+
+    // //////////////////////////////////////
+
+    public static <T> List<T> mutableCopy(final List<T> input) {
+        return stream(input)
+                .collect(Collectors.toList());
+    }
+
+    public static <T> List<T> mutableCopy(T[] arr) {
+        return stream(arr)
+                .collect(Collectors.toList());
+    }
+
+    public static <T> void insert(final List<T> list, final int insertionPoint, final T elementToInsert) {
+        extend(list, insertionPoint);
+        list.add(insertionPoint, elementToInsert);
+    }
+
+    public static <T> void adjust(final List<T> list, final int requiredLength) {
+        extend(list, requiredLength);
+        if(list.size() > requiredLength) {
+            list.subList(requiredLength, list.size()).clear();
+        }
+    }
+
+    private static <T> void extend(final List<T> list, final int requiredLength) {
+        for(int i=list.size(); i<requiredLength; i++) {
+            list.add(null);
+        }
+    }
+
+    public static <T> Collection<T> filtered(final List<Object> extendee, final Class<T> type) {
+        return _NullSafe.stream(extendee)
+                .filter(ClassPredicates.isOfType(type))
+                .map(ClassFunctions.castTo(type))
+                .collect(Collectors.toList());
+    }
+
+
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/LocaleUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/LocaleUtil.java
new file mode 100644
index 0000000..4915960
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/LocaleUtil.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Locale;
+
+import org.apache.isis.core.commons.internal.base._Strings;
+
+public class LocaleUtil {
+
+    public static Locale findLocale(final String localeStr) {
+        if (_Strings.isNotEmpty(localeStr)) {
+            final Locale[] availableLocales = Locale.getAvailableLocales();
+            for (final Locale locale : availableLocales) {
+                if (locale.toString().equals(localeStr)) {
+                    return locale;
+                }
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MapUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MapUtil.java
new file mode 100644
index 0000000..77b5f63
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MapUtil.java
@@ -0,0 +1,48 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class MapUtil {
+
+    private MapUtil() {
+    }
+
+    /**
+     * Converts a list of objects [a, 1, b, 2] into a map {a -> 1; b -> 2}
+     */
+    @SuppressWarnings("unchecked")
+    public static <K,V> Map<K,V> asMap(Object... keyValPair){
+        Map<K,V> map = new HashMap<K,V>();
+
+        if(keyValPair.length % 2 != 0){
+            throw new IllegalArgumentException("Keys and values must be pairs.");
+        }
+
+        for(int i = 0; i < keyValPair.length; i += 2){
+            map.put((K) keyValPair[i], (V) keyValPair[i+1]);
+        }
+
+        return Collections.unmodifiableMap(map);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodExtensions.java
new file mode 100644
index 0000000..e97a1f0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodExtensions.java
@@ -0,0 +1,92 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+public class MethodExtensions {
+
+    private MethodExtensions() {
+    }
+
+    public static boolean isStatic(final Method method) {
+        return Modifier.isStatic(method.getModifiers());
+    }
+
+    // //////////////////////////////////////
+
+    public static Object invoke(final Method method, final Object object) {
+        final Object[] parameters = MethodExtensions.getNullOrDefaultArgs(method);
+        return MethodExtensions.invoke(method, object, parameters);
+    }
+
+    public static Object invoke(final Method method, final Object object, final Object[] arguments) {
+        try {
+            Object[] defaultAnyPrimitive = defaultAnyPrimitive(method.getParameterTypes(), arguments);
+            return MethodInvocationPreprocessor.invoke(method, object, defaultAnyPrimitive);
+        } catch (Exception e) {
+            return ThrowableExtensions.handleInvocationException(e, method.getName());
+        }
+    }
+
+    private static Object[] defaultAnyPrimitive(Class<?>[] parameterTypes, Object[] arguments) {
+        if(parameterTypes == null || arguments == null || parameterTypes.length != arguments.length) {
+            return arguments;
+        }
+        final Object[] argumentsWithPrimitivesDefaulted = new Object[arguments.length];
+        for(int i=0; i<argumentsWithPrimitivesDefaulted.length; i++) {
+            argumentsWithPrimitivesDefaulted[i] = valueIfPrimitiveThenDefaulted(parameterTypes[i], arguments[i]);
+        }
+        return argumentsWithPrimitivesDefaulted;
+    }
+
+    private static Object valueIfPrimitiveThenDefaulted(Class<?> cls, Object argument) {
+        if(argument != null) {
+            return argument;
+        }
+        if(!cls.isPrimitive()) {
+            return argument;
+        }
+        return ClassUtil.defaultByPrimitiveClass.get(cls);
+    }
+
+    public static Object invokeStatic(final Method method, final Object[] parameters) {
+        return invoke(method, null, parameters);
+    }
+
+    public static Object invokeStatic(final Method method) {
+        return invoke(method, null, MethodExtensions.getNullOrDefaultArgs(method));
+    }
+
+    // //////////////////////////////////////
+
+
+    public static Object[] getNullOrDefaultArgs(final Method method) {
+        final Class<?>[] paramTypes = method.getParameterTypes();
+        final Object[] parameters = new Object[paramTypes.length];
+        for (int i = 0; i < parameters.length; i++) {
+            parameters[i] = ClassExtensions.getNullOrDefault(paramTypes[i]);
+        }
+        return parameters;
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodInvocationPreprocessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodInvocationPreprocessor.java
new file mode 100644
index 0000000..8c2d2b0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodInvocationPreprocessor.java
@@ -0,0 +1,154 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
+
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
+
+import lombok.val;
+
+/**
+ * Utility for method invocation pre-processing.
+ * <p>
+ * For a given array of parameters, we intercept and adapt those,
+ * that are not compatible with the expected target parameter type.
+ * </p>
+ * <p>
+ * By now we do this for collection parameter types List, Set, SortedSet, Collection and Arrays.
+ * </p>
+ */
+public class MethodInvocationPreprocessor {
+
+    public static Object invoke(Method method, Object targetPojo, Object[] executionParameters)
+            throws IllegalAccessException, InvocationTargetException {
+
+        if (isEmpty(executionParameters)) {
+            return method.invoke(targetPojo, executionParameters);
+        }
+
+        val parameterTypes = method.getParameterTypes();
+        val paramCount = parameterTypes.length;
+        val adaptedExecutionParameters = new Object[paramCount];
+
+        for(int i=0; i<paramCount; ++i) {
+            val origParam = _Arrays.get(executionParameters, i).orElse(null);
+            adaptedExecutionParameters[i] = adapt(origParam, parameterTypes[i]);
+        }
+
+        try {
+            return method.invoke(targetPojo, adaptedExecutionParameters);
+        } catch (IllegalArgumentException e) {
+            throw verboseArgumentException(parameterTypes, adaptedExecutionParameters, e);
+        }
+    }
+
+    // -- OBJECT ADAPTER
+
+
+    /**
+     * Replaces obj (if required) to be conform with the parameterType
+     * @param obj
+     * @param parameterType
+     * @return
+     */
+
+    private static Object adapt(Object obj, Class<?> parameterType) {
+
+        if(obj==null) {
+            return null;
+        }
+
+        if(_Arrays.isArrayType(parameterType)) {
+            final Class<?> componentType = _Arrays.inferComponentTypeIfAny(parameterType);
+            if(componentType==null) {
+                return obj;
+            }
+            @SuppressWarnings("rawtypes") final List list = (List)obj;
+            return _Arrays.toArray(_Casts.uncheckedCast(list), componentType);
+        }
+
+        // allow no side effects on Collection arguments
+        if(Collection.class.equals(parameterType)) {
+            return _Collections.asUnmodifiableCollection((List<?>)obj);
+        }
+
+        // allow no side effects on List arguments
+        if(List.class.equals(parameterType)) {
+            return _Collections.asUnmodifiableList((List<?>)obj);
+        }
+
+        // adapt as Set (unmodifiable)
+        if(Set.class.equals(parameterType)) {
+            return _Collections.asUnmodifiableSet((List<?>)obj);
+        }
+
+        // adapt as SortedSet (unmodifiable)
+        if(SortedSet.class.equals(parameterType)) {
+            return _Collections.asUnmodifiableSortedSet((List<?>)obj);
+        }
+
+        return obj;
+    }
+
+    private static IllegalArgumentException verboseArgumentException(
+            Class<?>[] parameterTypes, 
+            Object[] adaptedExecutionParameters,
+            IllegalArgumentException e) {
+
+        val sb = new StringBuilder();
+        
+        val expectedParamCount = _NullSafe.size(parameterTypes);
+        val actualParamCount = _NullSafe.size(adaptedExecutionParameters);
+        if(expectedParamCount!=actualParamCount) {
+            sb.append(String.format("param-count mismatch: expected %d, got %d\n", 
+                    expectedParamCount, actualParamCount));
+        } else {
+            sb.append("expected param type mismatch\n");
+        }
+        
+        for(int j=0;j<parameterTypes.length;++j) {
+            final Class<?> parameterType = parameterTypes[j];
+            final String parameterValueTypeLiteral = _Arrays.get(adaptedExecutionParameters, j)
+                    .map(Object::getClass)
+                    .map(Class::getName)
+                    .orElse("missing or null");
+
+            sb.append(String.format("param-type[%d]: '%s', got '%s'\n", 
+                    j, parameterType.getName(), parameterValueTypeLiteral));
+        }
+        
+
+        // re-throw more verbose
+        return new IllegalArgumentException(sb.toString(), e);
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodUtil.java
new file mode 100644
index 0000000..fba381d
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/MethodUtil.java
@@ -0,0 +1,202 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import lombok.val;
+
+public class MethodUtil {
+
+    private MethodUtil(){}
+
+    public static void invoke(final Collection<Method> methods, final Object object) {
+        methods.forEach(method->MethodExtensions.invoke(method, object));
+    }
+
+    /**
+     * Searches the supplied array of methods for specific method and returns
+     * it, also removing it from supplied array if found (by setting to
+     * <tt>null</tt>).
+     *
+     * <p>
+     * Any methods that do not meet the search criteria are left in the array of
+     * methods.
+     */
+    public static Method removeMethod(
+            final Set<Method> methods,
+            final String name,
+            final Class<?> returnType,
+            final Class<?>[] paramTypes) {
+        
+        val methodIterator = methods.iterator();
+        while(methodIterator.hasNext()) {
+            val method = methodIterator.next();
+            if(matches(method, name, returnType, paramTypes)){
+                methodIterator.remove();
+                return method;
+            }
+        }
+        
+        return null;
+    }
+
+    /**
+     * Searches the supplied array of methods for specific method and returns
+     * its index, otherwise returns <tt>-1</tt>.
+     *
+     * <p>
+     * The search algorithm is:
+     * <ul>
+     * <li>has the specified prefix</li>
+     * <li>has the specified return type, or <tt>void</tt> if canBeVoid is
+     * <tt>true</tt> (but see below)</li>
+     * <li>has the specified number of parameters</li>
+     * </ul>
+     * If the returnType is specified as null then the return type is ignored.
+     */
+    private static boolean matches(
+            final Method method,
+            final String name,
+            final Class<?> returnType,
+            final Class<?>[] paramTypes) {
+        
+        if (!isPublic(method)) {
+            return false;
+        }
+
+        if (isStatic(method)) {
+            return false;
+        }
+
+        // check for name
+        if (!method.getName().equals(name)) {
+            return false;
+        }
+
+        // check for return type
+        if (returnType != null && returnType != method.getReturnType()) {
+            return false;
+        }
+
+        // check params (if required)
+        if (paramTypes != null) {
+            final Class<?>[] parameterTypes = method.getParameterTypes();
+            if (paramTypes.length != parameterTypes.length) {
+                return false;
+            }
+
+            for (int c = 0; c < paramTypes.length; c++) {
+                if ((paramTypes[c] != null) && (paramTypes[c] != parameterTypes[c])) {
+                    return false;
+                }
+            }
+        }
+        
+        return true;
+    }
+
+
+    /**
+     * Searches the supplied array of methods for all specific methods and
+     * returns them, also removing them from supplied array if found.
+     *
+     * <p>
+     * Any methods that do not meet the search criteria are left in the array of
+     * methods.
+     *
+     * <p>
+     * The search algorithm is:
+     * <ul>
+     * <li>has the specified prefix</li>
+     * <li>has the specified return type, or <tt>void</tt> if canBeVoid is
+     * <tt>true</tt> (but see below)</li>
+     * <li>has the specified number of parameters</li>
+     * </ul>
+     * If the returnType is specified as null then the return type is ignored.
+     *
+     * @param name
+     * @param onRemoval
+     * @param paramTypes
+     *            the set of parameters the method should have, if null then is
+     *            ignored
+     * @param returnType
+     * @param canBeVoid
+     * @return Method
+     */
+    public static void removeMethods(
+            Set<Method> methods,
+            String prefix,
+            Class<?> returnType,
+            CanBeVoid canBeVoid,
+            int paramCount,
+            Consumer<Method> onMatch) {
+
+        methods.removeIf(method -> 
+            matches(method, prefix, returnType, canBeVoid, paramCount, onMatch));
+        
+    }
+
+    private static boolean matches(
+            Method method,
+            String prefix,
+            Class<?> returnType,
+            CanBeVoid canBeVoid,
+            int paramCount,
+            Consumer<Method> onMatch) {
+
+        if (isStatic(method)) {
+            return false;
+        }
+
+        val goodPrefix = method.getName().startsWith(prefix);
+        val goodCount = method.getParameterTypes().length == paramCount;
+        val type = method.getReturnType();
+        val goodReturn = ClassExtensions.isCompatibleAsReturnType(returnType, canBeVoid, type);
+
+        if (goodPrefix && goodCount && goodReturn) {
+            onMatch.accept(method);
+            return true;
+        }
+        
+        return false;
+        
+    }
+
+
+    public static boolean isNotStatic(final Method method) {
+        return !isStatic(method);
+    }
+
+    public static boolean isStatic(final Method method) {
+        final int modifiers = method.getModifiers();
+        return Modifier.isStatic(modifiers);
+    }
+
+    public static boolean isPublic(Member method) {
+        final int modifiers = method.getModifiers();
+        return Modifier.isPublic(modifiers);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ObjectExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ObjectExtensions.java
new file mode 100644
index 0000000..c999563
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ObjectExtensions.java
@@ -0,0 +1,82 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.isis.core.commons.internal._Constants;
+
+/**
+ * Helpers to co-erce non-generic values into type-safe generics without
+ * having to suppress compiler warnings all over the place.
+ */
+public final class ObjectExtensions {
+
+    private ObjectExtensions() {
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T asT(final Object extendee) {
+        return (T) extendee;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> List<T> asListT(final Object extendee, final Class<T> castTo) {
+        return (List<T>) extendee;
+    }
+
+    public static Object[] asArray(final Object extendee) {
+        final Class<?> arrayType = extendee.getClass().getComponentType();
+        if (!arrayType.isPrimitive()) {
+            return (Object[]) extendee;
+        }
+        if (arrayType == char.class) {
+            return ArrayExtensions.asCharToCharacterArray(extendee);
+        } else {
+            return ArrayExtensions.convertPrimitiveToObjectArray(extendee, arrayType);
+        }
+    }
+
+    public static Method getMethod(final Object object, final String methodName, final Class<?>... parameterClass) throws NoSuchMethodException {
+        return ClassExtensions.getMethod(object.getClass(), methodName, parameterClass);
+    }
+
+    public static Method getMethod(final Object object, final String methodName) throws NoSuchMethodException {
+        return ClassExtensions.getMethod(object.getClass(), methodName, _Constants.emptyClasses);
+    }
+
+    public static String classBaseName(final Object forObject) {
+        final String name = forObject.getClass().getName();
+        return name.substring(name.lastIndexOf('.') + 1);
+    }
+
+    public static void appendToString(final Object extendee, final Appendable buf) {
+        try {
+            buf.append(classBaseName(extendee));
+            buf.append('@');
+            buf.append(Integer.toHexString(extendee.hashCode()));
+        } catch (IOException iox) {
+            throw new RuntimeException("A problem occurred while appending an object to an appendable", iox);
+        }
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ResourceUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ResourceUtil.java
new file mode 100644
index 0000000..5033ae8
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ResourceUtil.java
@@ -0,0 +1,83 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.isis.core.commons.internal.context._Context;
+
+public class ResourceUtil {
+
+    private ResourceUtil(){}
+
+    public static InputStream getResourceAsStream(final String resource) {
+
+        // try Isis's classloader
+        ClassLoader classLoader = _Context.getDefaultClassLoader();
+        InputStream is = classLoader.getResourceAsStream(resource);
+        if (is != null) {
+            return is;
+        }
+
+        // try thread's classloader
+        classLoader = Thread.currentThread().getContextClassLoader();
+        is = classLoader.getResourceAsStream(resource);
+        if (is != null) {
+            return is;
+        }
+
+        // try this class' classloader
+        classLoader = ResourceUtil.class.getClassLoader();
+        is = classLoader.getResourceAsStream(resource);
+        if (is != null) {
+            return is;
+        }
+
+        // try system class loader (could return null)
+        // have wrapped in a try...catch because for same reason as
+        // getResourceURL
+        try {
+            return ClassLoader.getSystemResourceAsStream(resource);
+        } catch (final NullPointerException ignore) {
+            return null;
+        }
+    }
+
+    /**
+     * @param request
+     * @return real-path resource from file-system, if any
+     */
+    public static InputStream getResourceAsStream(final HttpServletRequest request) {
+        final String realPath = request.getSession().getServletContext().getRealPath(request.getServletPath());
+        if (realPath == null) {
+            return null;
+        }
+        try {
+            return new FileInputStream(realPath);
+        } catch (final FileNotFoundException e) {
+            return null;
+        }
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
new file mode 100644
index 0000000..1b56106
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
@@ -0,0 +1,393 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.apache.isis.applib.util.Enums;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.resources._Resources;
+
+public final class StringExtensions {
+
+    private StringExtensions() {}
+
+    // ////////////////////////////////////////////////////////////
+    // naturalName, naturalize, simpleName, camel, memberIdFor
+    // ////////////////////////////////////////////////////////////
+
+    /**
+     * Returns a word spaced version of the specified name, so there are spaces
+     * between the words, where each word starts with a capital letter. E.g.,
+     * "NextAvailableDate" is returned as "Next Available Date".
+     */
+    public static String asNaturalName2(String name) {
+        return _Strings.asNaturalName2.apply(name);
+    }
+
+    public static String asNaturalName(final String extendee) {
+
+        int pos = 0;
+
+        // find first upper case character
+        while ((pos < extendee.length()) && Character.isLowerCase(extendee.charAt(pos))) {
+            pos++;
+        }
+
+        if (pos == extendee.length()) {
+            return "invalid name";
+        }
+        return naturalized(extendee, pos);
+    }
+
+    public static String asNaturalized(final String extendee) {
+        return naturalized(extendee, 0);
+    }
+
+    private static String naturalized(final String name, final int startingPosition) {
+        if (name.length() <= startingPosition) {
+            throw new IllegalArgumentException("string shorter than starting position provided");
+        }
+        final StringBuffer s = new StringBuffer(name.length() - startingPosition);
+        for (int j = startingPosition; j < name.length(); j++) { // process
+            // english name
+            // - add spaces
+            if ((j > startingPosition) && isStartOfNewWord(name.charAt(j), name.charAt(j - 1))) {
+                s.append(' ');
+            }
+            if (j == startingPosition) {
+                s.append(Character.toUpperCase(name.charAt(j)));
+            } else {
+                s.append(name.charAt(j));
+            }
+        }
+        final String str = s.toString();
+        return str;
+    }
+
+    private static boolean isStartOfNewWord(final char c, final char previousChar) {
+        return Character.isUpperCase(c) || Character.isDigit(c) && !Character.isDigit(previousChar);
+    }
+
+    public static String asCamel(final String extendee) {
+        final StringBuffer b = new StringBuffer(extendee.length());
+        final StringTokenizer t = new StringTokenizer(extendee);
+        b.append(t.nextToken());
+        while (t.hasMoreTokens()) {
+            final String token = t.nextToken();
+            b.append(token.substring(0, 1).toUpperCase()); // replace spaces
+            // with
+            // camelCase
+            b.append(token.substring(1));
+        }
+        return b.toString();
+    }
+
+    // TODO: combine with camel
+    public static String asCamelLowerFirst(final String extendee) {
+        final StringBuffer b = new StringBuffer(extendee.length());
+        final StringTokenizer t = new StringTokenizer(extendee);
+        b.append(asLowerFirst(t.nextToken()));
+        while (t.hasMoreTokens()) {
+            final String token = t.nextToken();
+            b.append(token.substring(0, 1).toUpperCase()); // replace spaces
+            // with camelCase
+            b.append(token.substring(1).toLowerCase());
+        }
+        return b.toString();
+    }
+
+    public static String asLowerDashed(String extendee) {
+        return _Strings.asLowerDashed.apply(extendee);
+    }
+
+    public static String asPascal(final String extendee) {
+        return capitalize(asCamel(extendee));
+    }
+
+    // ////////////////////////////////////////////////////////////
+    // capitalize, lowerFirst, firstWord
+    // ////////////////////////////////////////////////////////////
+
+    public static String capitalize(final String extendee) {
+        return _Strings.capitalize(extendee);
+    }
+
+    /**
+     * Simply forces first char to be lower case.
+     */
+    public static String asLowerFirst(final String extendee) {
+        if (_Strings.isNullOrEmpty(extendee)) {
+            return extendee;
+        }
+        if (extendee.length() == 1) {
+            return extendee.toLowerCase();
+        }
+        return extendee.substring(0, 1).toLowerCase() + extendee.substring(1);
+    }
+
+    // ////////////////////////////////////////////////////////////
+    // in, combinePaths, splitOnCommas
+    // ////////////////////////////////////////////////////////////
+
+    public static boolean in(final String extendee, final String[] strings) {
+        for (final String strCandidate : strings) {
+            if (strCandidate.equals(extendee)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static List<String> splitOnCommas(final String commaSeparatedExtendee) {
+        if (commaSeparatedExtendee == null) {
+            return null;
+        }
+        final String removeLeadingWhiteSpace = removeLeadingWhiteSpace(commaSeparatedExtendee);
+        // special handling
+        if (removeLeadingWhiteSpace.length() == 0) {
+            return Collections.emptyList();
+        }
+        final String[] splitAsArray = removeLeadingWhiteSpace.split("\\W*,\\W*");
+        return Arrays.asList(splitAsArray);
+    }
+
+
+    private static final char CARRIAGE_RETURN = '\n';
+    private static final char LINE_FEED = '\r';
+
+    /**
+     * Converts any <tt>\n</tt> to <tt>line.separator</tt>
+     *
+     * @param extendee
+     * @return
+     */
+    public static String lineSeparated(final String extendee) {
+        final StringBuilder buf = new StringBuilder();
+        final String lineSeparator = System.getProperty("line.separator");
+        boolean lastWasLineFeed = false;
+        for (final char c : extendee.toCharArray()) {
+            final boolean isLineFeed = c == LINE_FEED;
+            final boolean isCarriageReturn = c == CARRIAGE_RETURN;
+            if (isCarriageReturn) {
+                buf.append(lineSeparator);
+                lastWasLineFeed = false;
+            } else {
+                if (lastWasLineFeed) {
+                    buf.append(LINE_FEED);
+                }
+                if (isLineFeed) {
+                    lastWasLineFeed = true;
+                } else {
+                    buf.append(c);
+                    lastWasLineFeed = false;
+                }
+            }
+        }
+        if (lastWasLineFeed) {
+            buf.append(LINE_FEED);
+        }
+        return buf.toString();
+    }
+
+    // ////////////////////////////////////////////////////////////
+    // removeTabs, removeLeadingWhiteSpace, stripLeadingSlash, stripNewLines,
+    // normalize
+    // ////////////////////////////////////////////////////////////
+
+    public static String removeLeadingWhiteSpace(final String extendee) {
+        if (extendee == null) {
+            return null;
+        }
+        return extendee.replaceAll("^\\W*", "");
+    }
+
+    public static String stripNewLines(final String extendee) {
+        return extendee.replaceAll("[\r\n]", "");
+    }
+
+    public static String stripLeadingSlash(final String extendee) {
+        if (!extendee.startsWith("/")) {
+            return extendee;
+        }
+        if (extendee.length() < 2) {
+            return "";
+        }
+        return extendee.substring(1);
+    }
+
+    /**
+     * Condenses any whitespace to a single character
+     *
+     * @param extendee
+     * @return
+     */
+    public static String normalized(@javax.annotation.Nullable final String extendee) {
+        return _Strings.asNormalized.apply(extendee);
+    }
+
+    public static String removePrefix(final String extendee, final String prefix) {
+        return extendee.startsWith(prefix)
+                ? extendee.substring(prefix.length())
+                        : extendee;
+    }
+
+    public static String enumTitle(String enumName) {
+        return Enums.getFriendlyNameOf(enumName);
+    }
+
+    public static String enumDeTitle(String enumFriendlyName) {
+        return Enums.getEnumNameFromFriendly(enumFriendlyName);
+    }
+
+    /*
+     * eg converts <tt>HiddenFacetForMemberAnnotation</tt> to <tt>HFFMA</tt>.
+     */
+    public static String toAbbreviation(final String extendee) {
+        final StringBuilder buf = new StringBuilder();
+        for(char c: extendee.toCharArray()) {
+            if(Character.isUpperCase(c)) {
+                buf.append(c);
+            }
+        }
+        return buf.toString();
+    }
+
+
+    // //////////////////////////////////////
+    // copied in from Apache Commons
+    // //////////////////////////////////////
+
+
+
+    public static boolean startsWith(final String extendee, final String prefix) {
+        final int length = prefix.length();
+        if (length >= extendee.length()) {
+            return false;
+        } else {
+            final char startingCharacter = extendee.charAt(length);
+            return extendee.startsWith(prefix) && Character.isUpperCase(startingCharacter);
+        }
+    }
+
+    public static String combinePath(final String extendee, final String suffix) {
+        return _Resources.combinePath(extendee, suffix);
+    }
+
+    /**
+     * Returns the name of a Java entity without any prefix. A prefix is defined
+     * as the first set of lowercase letters and the name is characters from,
+     * and including, the first upper case letter. If no upper case letter is
+     * found then an empty string is returned.
+     *
+     * <p>
+     * Calling this method with the following Java names will produce these
+     * results:
+     *
+     * <pre>
+     *                     getCarRegistration        -&gt; CarRegistration
+     *                     CityMayor -&gt; CityMayor
+     *                     isReady -&gt; Ready
+     * </pre>
+     *
+     */
+    public static String asJavaBaseName(final String javaName) {
+        int pos = 0;
+
+        // find first upper case character
+        final int len = javaName.length();
+
+        while ((pos < len) && (javaName.charAt(pos) != '_') && Character.isLowerCase(javaName.charAt(pos))) {
+            pos++;
+        }
+
+        if (pos >= len) {
+            return "";
+        }
+
+        if (javaName.charAt(pos) == '_') {
+            pos++;
+        }
+
+        if (pos >= len) {
+            return "";
+        }
+
+        final String baseName = javaName.substring(pos);
+        final char firstChar = baseName.charAt(0);
+
+        if (Character.isLowerCase(firstChar)) {
+            return Character.toUpperCase(firstChar) + baseName.substring(1);
+        } else {
+            return baseName;
+        }
+    }
+
+    public static String asJavaBaseNameStripAccessorPrefixIfRequired(final String javaNameExtendee) {
+        if (javaNameExtendee.startsWith("is") || javaNameExtendee.startsWith("get")) {
+            return asJavaBaseName(javaNameExtendee);
+        } else {
+            return StringExtensions.asCapitalizedName(javaNameExtendee);
+        }
+    }
+
+    public static String asCapitalizedName(final String extendee) {
+
+        return Character.toUpperCase(extendee.charAt(0)) +
+                extendee.substring(1);
+    }
+
+
+    public static String asPluralName(final String extendee) {
+        String pluralName;
+        if (extendee.endsWith("y")) {
+            pluralName = extendee.substring(0, extendee.length() - 1) + "ies";
+        } else if (extendee.endsWith("s") || extendee.endsWith("x")) {
+            pluralName = extendee + "es";
+        } else {
+            pluralName = extendee + 's';
+        }
+        return pluralName;
+    }
+
+    public static String toCamelCase(final String extendee) {
+        final String nameLower = extendee.toLowerCase();
+        final StringBuilder buf = new StringBuilder();
+        boolean capitalizeNext = false;
+        for (int i = 0; i < nameLower.length(); i++) {
+            final char ch = nameLower.charAt(i);
+            if (ch == '_') {
+                capitalizeNext = true;
+            } else {
+                if (capitalizeNext) {
+                    buf.append(Character.toUpperCase(ch));
+                } else {
+                    buf.append(ch);
+                }
+                capitalizeNext = false;
+            }
+        }
+        return buf.toString();
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
new file mode 100644
index 0000000..0610af5
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
@@ -0,0 +1,82 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.lang.invoke.WrongMethodTypeException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.function.Consumer;
+
+import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.metamodel.exceptions.MetaModelException;
+import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
+
+public final class ThrowableExtensions {
+
+    public static Object handleInvocationException(
+            final Throwable e,
+            final String memberName) {
+        return handleInvocationException(e, memberName, null);
+    }
+
+    public static Object handleInvocationException(
+            final Throwable e,
+            final String memberName,
+            final Consumer<RecoverableException> recovery) {
+
+        if(e instanceof InvocationTargetException) {
+            return handleInvocationException(((InvocationTargetException) e).getTargetException(), memberName, recovery);
+        }
+        if(e instanceof WrongMethodTypeException) {
+            throw new MetaModelException("Wrong method type access of " + memberName, e);
+        }
+        if(e instanceof IllegalAccessException) {
+            throw new ReflectiveActionException("Illegal access of " + memberName, e);
+        }
+        if(e instanceof IllegalStateException) {
+            throw new ReflectiveActionException( String.format(
+                    "IllegalStateException thrown while invoking %s %s",
+                    memberName, e.getMessage()), e);
+        }
+        if(e instanceof RecoverableException) {
+            return handleRecoverableException((RecoverableException)e, memberName, recovery);
+        }
+        if (e instanceof RuntimeException) {
+            throw (RuntimeException) e;
+        }
+        throw new MetaModelException("Exception invoking " + memberName, e);
+    }
+
+
+    private static Object handleRecoverableException(
+            final RecoverableException e,
+            final String memberName,
+            final Consumer<RecoverableException> recovery) {
+
+        if(recovery!=null)
+            recovery.accept(e);
+
+        // an application exception from the domain code is re-thrown as an
+        // IsisException with same semantics
+        // TODO: should probably be using ApplicationException here
+        throw new IsisApplicationException("Exception invoking " + memberName, e);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ToString.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ToString.java
new file mode 100644
index 0000000..683938c
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ToString.java
@@ -0,0 +1,165 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.commons;
+
+import java.util.Date;
+
+public final class ToString {
+
+    public static ToString createAnonymous(final Object object) {
+        final ToString string = new ToString();
+        string.append(ObjectExtensions.classBaseName(object));
+        string.append('[');
+        return string;
+    }
+
+    // //////////////////////////////////////
+
+    private boolean addComma = false;
+    private final StringBuilder buf;
+    private boolean useLineBreaks;
+
+    private ToString() {
+        buf = new StringBuilder();
+    }
+
+    public ToString(final Object forObject) {
+        buf = new StringBuilder();
+        ObjectExtensions.appendToString(forObject, buf);
+        buf.append('[');
+    }
+
+    public ToString(final Object forObject, final int id) {
+        buf = new StringBuilder();
+        buf.append(ObjectExtensions.classBaseName(forObject));
+        buf.append('#');
+        buf.append(id);
+        buf.append('[');
+    }
+
+    public ToString(final Object forObject, final String text) {
+        this(forObject);
+        buf.append(text);
+        addComma = text.length() > 0;
+    }
+
+    // //////////////////////////////////////
+
+    public ToString append(final char c) {
+        buf.append(c);
+        return this;
+    }
+
+    public ToString append(final String text) {
+        buf.append(text);
+        return this;
+    }
+
+    public ToString append(final String name, final boolean flag) {
+        append(name, flag ? "true" : "false");
+        return this;
+    }
+
+    public ToString append(final String name, final byte number) {
+        append(name, Byte.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final double number) {
+        append(name, Double.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final float number) {
+        append(name, Float.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final int number) {
+        append(name, Integer.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final long number) {
+        append(name, Long.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final Object object) {
+        append(name, object == null ? "null" : object.toString());
+        return this;
+    }
+
+    public ToString append(final String name, final short number) {
+        append(name, Short.toString(number));
+        return this;
+    }
+
+    public ToString append(final String name, final String string) {
+        if (addComma) {
+            this.buf.append(',');
+            if (useLineBreaks) {
+                this.buf.append("\n\t");
+            }
+        } else {
+            addComma = true;
+        }
+        this.buf.append(name);
+        this.buf.append('=');
+        this.buf.append(string);
+
+        return this;
+    }
+
+    public ToString appendAsHex(final String name, final long number) {
+        append(name, "#" + Long.toHexString(number));
+        return this;
+    }
+
+    public void appendAsTimestamp(final String name, final Date date) {
+        final String dateString = DateExtensions.asTimestamp(date);
+        append(name, dateString);
+    }
+
+    public void appendTruncated(final String name, final String string, final int maxLength) {
+        if (string.length() > maxLength) {
+            append(name, string.substring(0, maxLength));
+            append("...");
+        } else {
+            append(name, string);
+        }
+    }
+
+    public void setAddComma() {
+        this.addComma = true;
+    }
+
+    public void setUseLineBreaks(final boolean useLineBreaks) {
+        this.useLineBreaks = useLineBreaks;
+    }
+
+    // //////////////////////////////////////
+
+    @Override
+    public String toString() {
+        buf.append(']');
+        return buf.toString();
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/Wormhole.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/Wormhole.java
new file mode 100644
index 0000000..77937bb
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/Wormhole.java
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.commons;
+
+/**
+ * Provides a mechanism to avoid infinite loops whereby method A -&gt; method B -&gt; method C -&gt; method A and so on.
+ */
+public final class Wormhole {
+
+    private Wormhole(){}
+
+    private ThreadLocal<Boolean> inWormhole = new ThreadLocal<Boolean>() {
+        @Override
+        protected Boolean initialValue() {
+            return false;
+        }
+    };
+
+    public void run(final Runnable runnable) {
+        try {
+            if(inWormhole.get()) {
+                return;
+            }
+            inWormhole.set(true);
+            runnable.run();
+        } finally {
+            inWormhole.set(false);
+        }
+    }
+
+    public static void invoke(final Runnable runnable) {
+        new Wormhole().run(runnable);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/package-info.java
new file mode 100644
index 0000000..2fd7191
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/package-info.java
@@ -0,0 +1,27 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * This package holds a small number of classes to extend the JDK.
+ *
+ * <p>
+ * These classes should be thought of as being in the same spirit as
+ * the google <i>guava</i> library helper classes (and some may be replaced by guava in the future).
+ */
+package org.apache.isis.core.metamodel.commons;
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
new file mode 100644
index 0000000..e48ffb0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
@@ -0,0 +1,56 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+
+/**
+ * An instance of this type is used to allow something.
+ */
+public class Allow extends ConsentAbstract {
+
+    private static final long serialVersionUID = 1L;
+
+    public static Allow DEFAULT = new Allow();
+
+    private Allow() {
+        this((String) null);
+    }
+
+    /**
+     * Called by DnD viewer; we should instead find a way to put the calling
+     * logic into {@link Facet}s so that it is available for use by other
+     * viewers.
+     *
+     * @see Veto
+     * @deprecated
+     * @param reasonVeteod
+     * @param advisorClass
+     */
+    @Deprecated
+    public Allow(final String description) {
+        super(description, null);
+    }
+
+    public Allow(final InteractionResult interactionResult) {
+        super(interactionResult);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java
new file mode 100644
index 0000000..cce26e4
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java
@@ -0,0 +1,73 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+public interface Consent {
+
+    /**
+     * Returns true if this object is giving permission.
+     */
+    boolean isAllowed();
+
+    /**
+     * Returns true if this object is NOT giving permission.
+     */
+    boolean isVetoed();
+
+    /**
+     * Why consent is being vetoed.
+     *
+     * <p>
+     * Will be non-<tt>null</tt> and non-empty if vetoed. Will be <tt>null</tt>
+     * (<i>not</i> the empty string) if this is consent is is allowed.
+     *
+     * <p>
+     * Will correspond to the {@link InteractionResult#getReason() reason} in
+     * the contained {@link #getInteractionResult() InteractionResult} (if one
+     * was specified).
+     */
+    String getReason();
+
+    /**
+     * Description of the interaction that this consent represents.
+     *
+     * <p>
+     * May be <tt>null</tt>.
+     */
+    String getDescription();
+
+    /**
+     * Allows the description of the interaction to which this consent relates
+     * to be specified or refined.
+     *
+     * @param description
+     * @return this consent
+     */
+    Consent setDescription(String description);
+
+    /**
+     * The {@link InteractionResult} that created this {@link Consent}.
+     *
+     * @return - may be <tt>null</tt> if created as a legacy {@link Consent}.
+     *
+     */
+    public InteractionResult getInteractionResult();
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java
new file mode 100644
index 0000000..995356c
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java
@@ -0,0 +1,159 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import java.io.Serializable;
+
+public abstract class ConsentAbstract implements Serializable, Consent {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Factory method.
+     *
+     * <p>
+     * Used extensively by the DnD viewer.
+     */
+    public static Consent allowIf(final boolean allowed) {
+        return allowed ? Allow.DEFAULT : Veto.DEFAULT;
+    }
+
+    private final InteractionResult interactionResult;
+    private final String reason;
+
+    /**
+     * Can be subsequently {@link #setDescription(String) modified}, but is only
+     * a description of the event to which this consent applies and does not
+     * change whether the Consent represents an allow or a veto.
+     */
+    private String description;
+
+    private static String determineReason(final InteractionResult interactionResult) {
+        if (interactionResult == null) {
+            return null;
+        }
+        return interactionResult.getReason();
+    }
+
+    /**
+     *
+     * @param interactionResult
+     *            - if <tt>null</tt> then defaults to an {@link #isAllowed()
+     *            allowing} {@link Consent}.
+     */
+    protected ConsentAbstract(final InteractionResult interactionResult) {
+        this(interactionResult, null, determineReason(interactionResult));
+    }
+
+    /**
+     * Enable legacy {@link Consent}s (not created using an
+     * {@link InteractionResult}) to create an {@link Consent}, specifying a
+     * {@link #getDescription() description} of the event and the
+     * {@link #getReason() reason} (if any) that the consent is vetoed.
+     *
+     * @param description
+     *            - a description of the event to which this consent relates
+     * @param reason
+     *            - if not <tt>null</tt> and not empty, is the reason this
+     *            consent is vetoed.
+     */
+    protected ConsentAbstract(final String description, final String reason) {
+        this(null, description, reason);
+    }
+
+    private ConsentAbstract(
+            final InteractionResult interactionResult,
+            final String description,
+            final String reason) {
+        this.interactionResult = interactionResult;
+        this.description = description;
+        this.reason = reason;
+    }
+
+    /**
+     * The reason why this has been vetoed.
+     */
+    @Override
+    public String getReason() {
+        return isVetoed() ? this.reason : null;
+    }
+
+    @Override
+    public Consent setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this object is giving permission (if the
+     * {@link #getReason() reason} is <tt>null</tt> or empty.
+     *
+     * @see #getReason()
+     */
+    @Override
+    public boolean isAllowed() {
+        return this.reason == null || this.reason.equals("");
+    }
+
+    /**
+     * Returns true if this object is NOT giving permission.
+     *
+     * @see #isAllowed()
+     */
+    @Override
+    public boolean isVetoed() {
+        return !isAllowed();
+    }
+
+    /**
+     * Underlying {@link InteractionResult} that created this {@link Consent}
+     * (may be <tt>null</tt>).
+     *
+     */
+    @Override
+    public InteractionResult getInteractionResult() {
+        return interactionResult;
+    }
+
+    /**
+     * Description of the action allowed by this event.
+     *
+     * <p>
+     * (Previously, {@link Allow} consents overloaded the {@link #getReason()
+     * reason} property with a description of the event. This has now been
+     * changed so that a non-<tt>null</tt> reason always implies a {@link Veto}.
+     * This property captures the description.
+     *
+     * @return
+     */
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public String toString() {
+        return (isVetoed() ? "VETOED" : "ALLOWED") + ", reason=" + reason;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
new file mode 100644
index 0000000..28d8a5f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
@@ -0,0 +1,103 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
+
+/**
+ * Marker interface for implementations (specifically, {@link Facet}s) that can
+ * advise as to whether a member should be disabled.
+ *
+ * Used within {@link Allow} and {@link Veto}.
+ */
+public interface InteractionAdvisor {
+
+    /**
+     * For testing purposes only.
+     */
+    public static InteractionAdvisor NOOP = new InteractionAdvisorFacet() {
+        @Override
+        public void appendAttributesTo(final Map<String, Object> attributeMap) {
+        }
+
+        @Override
+        public boolean alwaysReplace() {
+            return false;
+        }
+
+        @Override
+        public Class<? extends Facet> facetType() {
+            return null;
+        }
+
+        @Override
+        public FacetHolder getFacetHolder() {
+            return null;
+        }
+
+        @Override
+        public boolean isFallback() {
+            return true;
+        }
+
+        @Override
+        public void setFacetHolder(final FacetHolder facetHolder) {
+        }
+
+        @Override
+        public Facet getUnderlyingFacet() {
+            return null;
+        }
+
+        @Override
+        public void setUnderlyingFacet(final Facet underlyingFacet) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isDerived() {
+            return false;
+        }
+
+        @Override
+        public void addContributedFacet(Facet contributedFacet) {
+            throw _Exceptions.unsupportedOperation();
+        }
+
+        @Override
+        public void forEachContributedFacet(Consumer<Facet> onContributedFacet) {
+            throw _Exceptions.unsupportedOperation();
+        }
+
+        @Override
+        public Class<? extends Facet> facetAliasType() {
+            return null;
+        }
+
+
+    };
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
new file mode 100644
index 0000000..2c79d82
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
@@ -0,0 +1,135 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+
+/**
+ * Powertype for the {@link InteractionContext} hierarchy.
+ *
+ */
+public enum InteractionContextType {
+
+    /**
+     * Persisting the object.
+     */
+    OBJECT_VALIDATE("Saving or updating object"),
+    /**
+     * Viewing the object.
+     */
+    OBJECT_VISIBILITY("Viewing the object"),
+    /**
+     * Accessing the object's title.
+     */
+    OBJECT_TITLE("Reading object's title"),
+    /**
+     * Determining whether the property of the object is visible (or has been
+     * hidden).
+     */
+    PROPERTY_VISIBLE("View property"),
+    /**
+     * Determining whether the property of the object is either readable or
+     * modifiable (or has been disabled).
+     */
+    PROPERTY_USABLE("Use property"),
+    /**
+     * Reading the current value of the property of the object.
+     */
+    PROPERTY_READ("Read property"),
+    /**
+     * Modifying (or attempting to modify) the value of a property.
+     */
+    PROPERTY_MODIFY("Modify property"),
+    /**
+     * Determining whether the collection of the object is visible (or has been
+     * hidden).
+     */
+    COLLECTION_VISIBLE("View collection"),
+    /**
+     * Determining whether the collection of the object is either readable or
+     * modifiable (or has been disabled).
+     */
+    COLLECTION_USABLE("Use collection"),
+    /**
+     * Reading the contents of the collection.
+     */
+    COLLECTION_READ("Read contents of collection"),
+    /**
+     * Adding to (or attempting to add to) a collection.
+     */
+    COLLECTION_ADD_TO("Add to collection"),
+    /**
+     * Removing from (or attempting to remove from) a collection.
+     */
+    COLLECTION_REMOVE_FROM("Remove from collection"),
+    /**
+     * Whether the action of the object is visible (or has been hidden).
+     */
+    ACTION_VISIBLE("View action"),
+    /**
+     * Whether the action of the object is usable (or has been disabled).
+     */
+    ACTION_USABLE("Use action"),
+    /**
+     * Whether this particular action parameter argument is visible
+     * (given other parameter arguments that may already have been entered).
+     */
+    ACTION_PARAMETER_VISIBLE("Parameter visible"),
+    /**
+     * Whether this particular action parameter argument is usable
+     * (given other parameter arguments that may already have been entered).
+     */
+    ACTION_PARAMETER_USABLE("Parameter usable"),
+    /**
+     * Whether this particular proposed argument for an action invocation is
+     * valid (or if it is in fact invalid).
+     *
+     * <p>
+     * For example, ensuring that a regular expression match or number range is
+     * correct.
+     */
+    ACTION_PROPOSED_ARGUMENT("Proposed argument"),
+    /**
+     * Invoking (or attempting to invoke) an action.
+     *
+     * <p>
+     * Even if each of the {@link #ACTION_PROPOSED_ARGUMENT proposed arguments}
+     * are valid, it may not be possible to invoke the action if there the
+     * arguments together are invalid (for example,
+     * <tt>startDate &gt; endDate</tt>).
+     */
+    ACTION_INVOKE("Invoke action"),
+
+    /**
+     * Parsing a value (could be an property or an action argument).
+     */
+    PARSE_VALUE("Parsing value");
+
+    private final String description;
+
+    private InteractionContextType(final String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInitiatedBy.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInitiatedBy.java
new file mode 100644
index 0000000..d734a30
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInitiatedBy.java
@@ -0,0 +1,33 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+
+/**
+ * Whether an {@link InteractionContext} was invoked by the user, or is
+ * by the framework/programmatic.
+ */
+public enum InteractionInitiatedBy {
+
+    USER,
+    FRAMEWORK;
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
new file mode 100644
index 0000000..a72c0dc
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
@@ -0,0 +1,155 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+
+public class InteractionResult {
+
+    /**
+     * Initially {@link #ADVISING}; when call
+     * {@link InteractionResult#getInteractionEvent()}, flips over into
+     * {@link #ADVISED}.
+     *
+     * <p>
+     * Subsequent attempts to
+     * {@link InteractionResult#advise(String, InteractionAdvisor)} will then be
+     * disallowed.
+     */
+    enum State {
+        ADVISING, ADVISED
+    }
+
+    private final InteractionEvent interactionEvent;
+    private final StringBuilder reasonBuf = new StringBuilder();
+    private final List<InteractionAdvisor> advisors = new ArrayList<InteractionAdvisor>();
+
+    private State state = State.ADVISING;
+
+    public InteractionResult(final InteractionEvent interactionEvent) {
+        this.interactionEvent = interactionEvent;
+    }
+
+    /**
+     * Returns the contained {@link InteractionEvent}, if necessary updated with
+     * the {@link #advise(String, InteractionAdvisor) advice} of the
+     * interactions.
+     *
+     * <p>
+     * That is, if still {@link State#ADVISING advising}, then copies over the
+     * details from this result into the contained {@link InteractionEvent}, and
+     * flips into {@link State#ADVISED advised (done)}.
+     *
+     * @return
+     */
+    public InteractionEvent getInteractionEvent() {
+        if (state == State.ADVISING) {
+            interactionEvent.advised(getReason(), getAdvisorClass());
+            state = State.ADVISED;
+        }
+        return interactionEvent;
+    }
+
+    private Class<?> getAdvisorClass() {
+        final InteractionAdvisor advisor = getAdvisor();
+        return advisor != null ? advisor.getClass() : null;
+    }
+
+    public void advise(final String reason, final InteractionAdvisor facet) {
+        if (state == State.ADVISED) {
+            throw new IllegalStateException("Cannot append since have called getInteractionEvent");
+        }
+        if (reason == null) {
+            return;
+        }
+        if (isVetoing()) {
+            reasonBuf.append("; ");
+        }
+        advisors.add(facet);
+        reasonBuf.append(reason);
+    }
+
+    public boolean isVetoing() {
+        return !isNotVetoing();
+    }
+
+    public boolean isNotVetoing() {
+        return reasonBuf.length() == 0;
+    }
+
+    /**
+     * Returns the first of the {@link #getAdvisors()} that has been
+     * {@link #advise(String, InteractionAdvisor) advised} , or <tt>null</tt> if
+     * none yet.
+     *
+     * @see #getAdvisorFacets()
+     */
+    public InteractionAdvisor getAdvisor() {
+        return advisors.size() >= 1 ? advisors.get(0) : null;
+    }
+
+    /**
+     * Returns all {@link InteractionAdvisor advisor} (facet)s that have
+     * {@link #advise(String, InteractionAdvisor) append}ed reasons to the
+     * buffer.
+     *
+     * @see #getAdvisor()
+     */
+    public List<InteractionAdvisor> getAdvisorFacets() {
+        return Collections.unmodifiableList(advisors);
+    }
+
+    public Consent createConsent() {
+        if (isNotVetoing()) {
+            return new Allow(this);
+        } else {
+            return new Veto(this);
+        }
+    }
+
+    /**
+     * Gets the reason as currently known, but does not change the state.
+     *
+     * <p>
+     * If {@link #isNotVetoing()}, then returns <tt>null</tt>. Otherwise will be
+     * a non-empty string.
+     */
+    public String getReason() {
+        return isNotVetoing() ? null : reasonBuf.toString();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s: %s: %s (%d facets advised)", interactionEvent, state, toStringInterpret(reasonBuf), advisors.size());
+    }
+
+    private String toStringInterpret(final StringBuilder reasonBuf) {
+        if (getReason().length() == 0) {
+            return "allowed";
+        } else {
+            return "vetoed";
+        }
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
new file mode 100644
index 0000000..0355f57
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
@@ -0,0 +1,104 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InteractionResultSet {
+
+    private final List<InteractionResult> results = new ArrayList<InteractionResult>();
+    private InteractionResult firstResult = null;
+
+    public InteractionResultSet() {
+    }
+
+    public InteractionResultSet add(final InteractionResult result) {
+        if (firstResult == null) {
+            firstResult = result;
+        }
+        this.results.add(result);
+        return this;
+    }
+
+    /**
+     * Empty only if all the {@link #add(InteractionResult) contained}
+     * {@link InteractionResult}s are also
+     * {@link InteractionResult#isNotVetoing() empty}.
+     */
+    public boolean isAllowed() {
+        return !isVetoed();
+    }
+
+    /**
+     * Vetoed if any of the {@link #add(InteractionResult) contained}
+     * {@link InteractionResult}s are also {@link InteractionResult#isVetoing()
+     * not empty}.
+     *
+     * @return
+     */
+    public boolean isVetoed() {
+        for (final InteractionResult result : results) {
+            if (result.isVetoing()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the {@link Consent} corresponding to
+     * {@link #getInteractionResult()}, or an {@link Allow} if there have been
+     * no {@link InteractionResult}s {@link #add(InteractionResult) added}.
+     *
+     * @return
+     */
+    public Consent createConsent() {
+        final InteractionResult interactionResult = getInteractionResult();
+        if (interactionResult == null) {
+            return Allow.DEFAULT;
+        }
+        return interactionResult.createConsent();
+    }
+
+    /**
+     * Returns the &quot;best&quot; contained {@link InteractionResult}.
+     *
+     * <p>
+     * This will be the first {@link InteractionResult} that has vetoed the
+     * interaction, or the first {@link InteractionResult}
+     * {@link #add(InteractionResult) added} if none have vetoed.
+     *
+     * @return
+     */
+    public InteractionResult getInteractionResult() {
+        for (final InteractionResult result : results) {
+            if (!result.isNotVetoing()) {
+                return result;
+            }
+        }
+        return firstResult != null ? firstResult : null;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
new file mode 100644
index 0000000..f6272c6
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
@@ -0,0 +1,48 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.consent;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
+
+public class Veto extends ConsentAbstract {
+
+    private static final long serialVersionUID = 1L;
+
+    public static Veto DEFAULT = new Veto("Vetoed by default");
+
+    /**
+     * Called by DnD viewer; we should instead find a way to put the calling
+     * logic into {@link Facet}s so that it is available for use by other
+     * viewers.
+     *
+     * @param reasonVeteod
+     *            - must not be empty or <tt>null</tt>
+     */
+    public Veto(final String reasonVetoed) {
+        super(null, requiresNotEmpty(reasonVetoed, "reasonVetoed")); 
+    }
+
+    public Veto(final InteractionResult interactionResult) {
+        super(interactionResult);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
new file mode 100644
index 0000000..756a480
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
@@ -0,0 +1,212 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.context;
+
+import java.util.stream.Stream;
+
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.title.TitleService;
+import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.applib.services.xactn.TransactionState;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+
+/**
+ * 
+ * @since 2.0
+ *
+ */
+public interface MetaModelContext {
+
+    IsisSystemEnvironment getSystemEnvironment();
+    
+    /**
+     * 
+     * Configuration 'beans' with meta-data (IDE-support).
+     * 
+     * @see <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html">spring.io</a>
+     *
+     */
+    IsisConfiguration getConfiguration();
+
+    ObjectManager getObjectManager();
+    
+    ServiceInjector getServiceInjector();
+
+    ServiceRegistry getServiceRegistry();
+
+    SpecificationLoader getSpecificationLoader();
+    
+    public default ObjectSpecification getSpecification(final Class<?> type) {
+        return type != null ? getSpecificationLoader().loadSpecification(type) : null;
+    }
+
+    AuthenticationSessionProvider getAuthenticationSessionProvider();
+
+    TranslationService getTranslationService();
+
+    AuthorizationManager getAuthorizationManager();
+
+    AuthenticationManager getAuthenticationManager();
+
+    TitleService getTitleService();
+
+    RepositoryService getRepositoryService();
+
+    TransactionService getTransactionService();
+
+    TransactionState getTransactionState();
+
+    HomePageAction getHomePageAction();
+
+    Stream<ManagedObject> streamServiceAdapters();
+
+    ManagedObject lookupServiceAdapterById(String serviceId);
+    
+    <T> T getSingletonElseFail(Class<T> type);
+    
+    // -- EXTRACTORS
+    
+    public static MetaModelContext from(ManagedObject adapter) {
+        return adapter.getSpecification().getMetaModelContext();
+    }
+
+    // -- DELEGATION - FOR THOSE THAT IMPLEMENT THROUGH DELEGATION
+
+    public static interface Delegating extends MetaModelContext {
+
+        public MetaModelContext getMetaModelContext();
+
+        @Override
+        default IsisSystemEnvironment getSystemEnvironment() {
+            return getMetaModelContext().getSystemEnvironment();
+        }
+        
+        @Override
+        public default IsisConfiguration getConfiguration() {
+            return getMetaModelContext().getConfiguration();
+        }
+
+        @Override
+        public default ServiceInjector getServiceInjector() {
+            return getMetaModelContext().getServiceInjector();
+        }
+
+        @Override
+        public default ServiceRegistry getServiceRegistry() {
+            return getMetaModelContext().getServiceRegistry();
+        }
+
+        @Override
+        public default SpecificationLoader getSpecificationLoader() {
+            return getMetaModelContext().getSpecificationLoader();
+        }
+
+        @Override
+        public default AuthenticationSessionProvider getAuthenticationSessionProvider() {
+            return getMetaModelContext().getAuthenticationSessionProvider();
+        }
+
+        @Override
+        public default TranslationService getTranslationService() {
+            return getMetaModelContext().getTranslationService();
+        }
+
+        default AuthenticationSession getAuthenticationSession() {
+            return getAuthenticationSessionProvider().getAuthenticationSession();
+        }
+
+        @Override
+        public default AuthorizationManager getAuthorizationManager() {
+            return getMetaModelContext().getAuthorizationManager();
+        }
+
+        @Override
+        public default AuthenticationManager getAuthenticationManager() {
+            return getMetaModelContext().getAuthenticationManager();
+        }
+
+        @Override
+        public default TitleService getTitleService() {
+            return getMetaModelContext().getTitleService();
+        }
+
+        @Override
+        public default ObjectSpecification getSpecification(Class<?> type) {
+            return getMetaModelContext().getSpecification(type);
+        }
+
+        @Override
+        public default RepositoryService getRepositoryService() {
+            return getMetaModelContext().getRepositoryService();
+        }
+
+        @Override
+        public default TransactionState getTransactionState() {
+            return getMetaModelContext().getTransactionState();
+        }
+
+        @Override
+        public default HomePageAction getHomePageAction() {
+            return getMetaModelContext().getHomePageAction();
+        }
+
+        @Override
+        public default TransactionService getTransactionService() {
+            return getMetaModelContext().getTransactionService();
+        }
+
+        @Override
+        public default Stream<ManagedObject> streamServiceAdapters() {
+            return getMetaModelContext().streamServiceAdapters();
+        }
+
+        @Override
+        default ManagedObject lookupServiceAdapterById(String serviceId) {
+            return getMetaModelContext().lookupServiceAdapterById(serviceId);
+        }
+        
+        @Override
+        default <T> T getSingletonElseFail(Class<T> type) {
+            return getMetaModelContext().getSingletonElseFail(type);
+        }
+        
+        @Override
+        default ObjectManager getObjectManager() {
+            return getMetaModelContext().getObjectManager();
+        }
+
+    }
+
+    
+    
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContextAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContextAware.java
new file mode 100644
index 0000000..6a8676e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContextAware.java
@@ -0,0 +1,29 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.context;
+
+/**
+ * 
+ * @since 2.0
+ *
+ */
+public interface MetaModelContextAware {
+
+    void setMetaModelContext(MetaModelContext metaModelContext);
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
new file mode 100644
index 0000000..81a5e90
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
@@ -0,0 +1,172 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.context;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.title.TitleService;
+import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.applib.services.xactn.TransactionState;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.services.ServiceUtil;
+import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
+import org.apache.isis.core.metamodel.services.homepage.HomePageResolverService;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+
+import lombok.Getter;
+import lombok.val;
+
+
+class MetaModelContext_usingIoc implements MetaModelContext {
+
+    private final IocContainer iocContainer;
+    public MetaModelContext_usingIoc(IocContainer iocContainer) {
+        this.iocContainer = iocContainer;
+    }
+
+    @Getter(lazy=true) 
+    private final IsisSystemEnvironment systemEnvironment = 
+    getSingletonElseFail(IsisSystemEnvironment.class);
+    
+    @Getter(lazy=true) 
+    private final IsisConfiguration configuration = 
+    getSingletonElseFail(IsisConfiguration.class);
+
+    @Getter(lazy=true) 
+    private final ServiceInjector serviceInjector =
+    getSingletonElseFail(ServiceInjector.class);
+
+    @Getter(lazy=true) 
+    private final ServiceRegistry serviceRegistry =
+    getSingletonElseFail(ServiceRegistry.class);
+
+    @Getter(lazy=true) 
+    private final SpecificationLoader specificationLoader =
+    getSingletonElseFail(SpecificationLoader.class);
+
+    @Getter(lazy=true)
+    private final AuthenticationSessionProvider authenticationSessionProvider =
+    getSingletonElseFail(AuthenticationSessionProvider.class);
+
+    @Getter(lazy=true) 
+    private final TranslationService translationService =
+    getSingletonElseFail(TranslationService.class);
+
+    @Getter(lazy=true) 
+    private final AuthorizationManager authorizationManager =
+    getSingletonElseFail(AuthorizationManager.class); 
+
+    @Getter(lazy=true) 
+    private final AuthenticationManager authenticationManager =
+    getSingletonElseFail(AuthenticationManager.class);
+
+    @Getter(lazy=true) 
+    private final TitleService titleService =
+    getSingletonElseFail(TitleService.class);
+
+    @Getter(lazy=true) 
+    private final RepositoryService repositoryService =
+    getSingletonElseFail(RepositoryService.class);
+
+    @Getter(lazy=true) 
+    private final TransactionService transactionService =
+    getSingletonElseFail(TransactionService.class);
+
+    @Getter(lazy=true) 
+    private final HomePageResolverService homePageResolverService =
+    getSingletonElseFail(HomePageResolverService.class);
+
+    @Getter(lazy=true) 
+    private final ObjectManager objectManager =
+    getSingletonElseFail(ObjectManager.class);
+    
+    
+    @Override
+    public final TransactionState getTransactionState() {
+        return getTransactionService().currentTransactionState();
+    }
+
+    @Override
+    public final HomePageAction getHomePageAction() {
+        return getHomePageResolverService().getHomePageAction();
+    }
+
+    // -- SERVICE SUPPORT
+
+    @Override
+    public Stream<ManagedObject> streamServiceAdapters() {
+        return objectAdaptersForBeansOfKnownSort.get().values().stream();
+    }
+
+    @Override
+    public ManagedObject lookupServiceAdapterById(final String serviceId) {
+        return objectAdaptersForBeansOfKnownSort.get().get(serviceId);
+    }
+
+    // -- LOOKUP
+
+    @Override
+    public <T> T getSingletonElseFail(Class<T> type) {
+        return iocContainer.getSingletonElseFail(type);
+    }
+
+    
+    // -- HELPER
+
+    private final _Lazy<Map<String, ManagedObject>> objectAdaptersForBeansOfKnownSort = 
+            _Lazy.threadSafe(this::collectBeansOfKnownSort);
+
+    private Map<String, ManagedObject> collectBeansOfKnownSort() {
+
+        return getServiceRegistry()
+                .streamRegisteredBeans()
+                .map(this::toManagedObject) 
+                .collect(Collectors.toMap(ServiceUtil::idOfAdapter, v->v, (o,n)->n, LinkedHashMap::new));
+    }
+    
+    private ManagedObject toManagedObject(ManagedBeanAdapter managedBeanAdapter) {
+        
+        val servicePojo = managedBeanAdapter.getInstance().getFirst()
+                .orElseThrow(()->_Exceptions.unrecoverableFormatted(
+                        "Cannot get service instance of type '%s'", 
+                        managedBeanAdapter.getBeanClass()));
+        
+        return ManagedObject.of(getSpecificationLoader()::loadSpecification, servicePojo);
+        
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
new file mode 100644
index 0000000..8438cfb
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
@@ -0,0 +1,44 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.context;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+
+/**
+ * 
+ * @since 2.0
+ *
+ */
+@Configuration
+@Named("isisMetaModel.MetaModelContexts")
+public class MetaModelContexts {
+
+    @Bean @Singleton @Primary
+    public MetaModelContext metaModelContext(final IsisSystemEnvironment systemEnvironment) {
+        return new MetaModelContext_usingIoc(systemEnvironment.getIocContainer());
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
new file mode 100644
index 0000000..437ec37
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
@@ -0,0 +1,43 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.exceptions;
+
+import org.apache.isis.core.commons.exceptions.IsisException;
+
+public class MetaModelException extends IsisException {
+    private static final long serialVersionUID = 1L;
+
+    public MetaModelException() {
+        super();
+    }
+
+    public MetaModelException(final String message) {
+        super(message);
+    }
+
+    public MetaModelException(final Throwable cause) {
+        super(cause);
+    }
+
+    public MetaModelException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
new file mode 100644
index 0000000..f41384f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectNotFoundException.java
@@ -0,0 +1,38 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.exceptions.persistence;
+
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+
+/**
+ * Indicates that the <tt>PojoRecreator</tt> was unable to instantiate a new pojo for the specified
+ * {@link Oid}.
+ */
+public class ObjectNotFoundException extends ObjectPersistenceException {
+    private static final long serialVersionUID = 1L;
+
+    public ObjectNotFoundException(final Oid oid) {
+        super("Object not found in store with oid " + oid);
+    }
+
+    public ObjectNotFoundException(final Oid oid, final Throwable cause) {
+        super("Object not found in store with oid " + oid, cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
new file mode 100644
index 0000000..f1a9dd2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
@@ -0,0 +1,42 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.exceptions.persistence;
+
+import org.apache.isis.core.commons.exceptions.IsisException;
+
+public class ObjectPersistenceException extends IsisException {
+    private static final long serialVersionUID = 1L;
+
+    public ObjectPersistenceException() {
+        super();
+    }
+
+    public ObjectPersistenceException(final String message) {
+        super(message);
+    }
+
+    public ObjectPersistenceException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    public ObjectPersistenceException(final Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
new file mode 100644
index 0000000..fe11f34
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRecreationException.java
@@ -0,0 +1,31 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.exceptions.persistence;
+
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+
+public class PojoRecreationException extends ObjectPersistenceException {
+    private static final long serialVersionUID = 1L;
+
+    public PojoRecreationException(Oid oid, Throwable cause) {
+        super(String.format("Could not recreate pojo for oid '%s'.", oid), cause);
+
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
new file mode 100644
index 0000000..bbac79b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/PojoRefreshException.java
@@ -0,0 +1,34 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.exceptions.persistence;
+
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+
+public class PojoRefreshException extends ObjectNotFoundException {
+    private static final long serialVersionUID = 1L;
+
+    public PojoRefreshException(Oid oid) {
+        super(oid);
+    }
+
+    public PojoRefreshException(Oid oid, Throwable cause) {
+        super(oid, cause);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
new file mode 100644
index 0000000..34cd243
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
@@ -0,0 +1,123 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.function.Consumer;
+
+import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
+
+public interface Facet extends FacetWithAttributes {
+
+    /**
+     * The {@link FacetHolder holder} of this facet.
+     *
+     * @return
+     */
+    FacetHolder getFacetHolder();
+
+    /**
+     * Allows reparenting of Facet.
+     *
+     * <p>
+     * Used by Facet decorators.
+     *
+     * @param facetHolder
+     */
+    public void setFacetHolder(FacetHolder facetHolder);
+
+    /**
+     * Underlying {@link Facet} of the same {@link #facetType() type}, if any.
+     */
+    public Facet getUnderlyingFacet();
+
+    /**
+     * Sets underlying {@link Facet}, that is, creating a chain.
+     *
+     * <p>
+     * Must be of the same {@link #facetType() type}.
+     */
+    public void setUnderlyingFacet(Facet underlyingFacet);
+
+    /**
+     * Determines the type of this facet to be stored under.
+     *
+     * <p>
+     * The framework looks for {@link Facet}s of certain well-known facet types.
+     * Each facet implementation must specify which type of facet it corresponds
+     * to. This therefore allows the (rules of the) programming model to be
+     * varied without impacting the rest of the framework.
+     *
+     * <p>
+     * For example, the <tt>ActionInvocationFacet</tt> specifies the facet to
+     * invoke an action. The typical implementation of this wraps a
+     * <tt>public</tt> method. However, a different facet factory could be
+     * installed that creates facet also of type {@link ActionInvocationFacet}
+     * but that have some other rule, such as requiring an <i>action</i> prefix,
+     * or that decorate the interaction by logging it, for example.
+     */
+    Class<? extends Facet> facetType();
+
+    /**
+     * Whether this facet implementation is derived (as opposed to explicit);
+     * used to determine precedence.
+     *
+     * <p>
+     * For example, we might derive the typical length of a property based on
+     * its type; but if the typical length has been explicitly specified using
+     * an annotation then that should take precedence.
+     */
+    public boolean isDerived();
+
+    /**
+     * Whether this facet implementation is a fallback. Meaning it is treated 
+     * with lowest priority, always overruled by any other facet of same type.  
+     */
+    public boolean isFallback();
+
+    /**
+     * Whether this facet implementation should replace existing (none-fallback)
+     * implementations.
+     */
+    public boolean alwaysReplace();
+
+    // -- FACET ALIAS SUPPORT
+    
+    /**
+     * Adds a facet this facet contributes.
+     * @since 2.0
+     */
+    void addContributedFacet(Facet contributedFacet);
+
+    /**
+     * Traverses all contributed facets (if any).
+     * @since 2.0
+     */
+    void forEachContributedFacet(Consumer<Facet> onContributedFacet);
+
+    /**
+     * An alternative type this Facet can be looked up via {@link FacetHolder#getFacet(Class)}.
+     * @apiNote like {@link #facetType()} the alias must be unique within any facet-holder's 
+     * registered facet-types, otherwise an {@link IllegalArgumentException} is thrown during
+     * facet-processing; this is to ensure unambiguous lookup of facets by their alias type 
+     * @since 2.0
+     */
+    Class<? extends Facet> facetAliasType();
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
new file mode 100644
index 0000000..eba96cc
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
@@ -0,0 +1,287 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+
+import lombok.Setter;
+import lombok.val;
+
+
+public abstract class FacetAbstract implements Facet, MetaModelContext.Delegating {
+
+    public enum Derivation {
+        DERIVED,
+        NOT_DERIVED
+    }
+
+    private Facet underlyingFacet;
+
+    private final Class<? extends Facet> facetType;
+    @Setter private Class<? extends Facet> facetAliasType;
+    private Set<Facet> contributedFacets; // lazy init
+    
+    private final boolean derived;
+    private FacetHolder holder;
+
+    /**
+     * Populated in {@link #setFacetHolder(FacetHolder)} if the provided holder
+     * implements {@link IdentifiedHolder}.
+     *
+     * <p>
+     * Otherwise is <tt>null</tt>.
+     */
+    private IdentifiedHolder identifiedHolder;
+
+    public FacetAbstract(
+            Class<? extends Facet> facetType,
+            FacetHolder holder,
+            Derivation derivation) {
+        
+        this.facetType = requires(facetType, "facetType"); 
+        setFacetHolder(holder);
+        this.derived = (derivation == Derivation.DERIVED);
+    }
+    
+    protected FacetAbstract(
+            Class<? extends Facet> facetType,
+            FacetHolder holder) {
+        
+        this(facetType, holder, Derivation.NOT_DERIVED);
+    }
+
+    @Override
+    public final Class<? extends Facet> facetType() {
+        return facetType;
+    }
+    
+    @Override
+    public Class<? extends Facet> facetAliasType() {
+        return facetAliasType!=facetType ? facetAliasType : null; // avoids facetAliasType equals facetType 
+    }
+    
+    @Override
+    public FacetHolder getFacetHolder() {
+        return holder;
+    }
+    
+    @Override
+    public MetaModelContext getMetaModelContext() {
+        return holder.getMetaModelContext();
+    }
+
+    @Override
+    public boolean isDerived() {
+        return derived;
+    }
+
+    /**
+     * Convenience method that returns {@link #getFacetHolder()} downcast to
+     * {@link IdentifiedHolder} if the implementation does indeed inherit from
+     * {@link IdentifiedHolder}, otherwise <tt>null</tt>.
+     */
+    public IdentifiedHolder getIdentified() {
+        return identifiedHolder;
+    }
+
+    @Override
+    public Facet getUnderlyingFacet() {
+        return underlyingFacet;
+    }
+
+    @Override
+    public void setUnderlyingFacet(final Facet underlyingFacet) {
+        if(underlyingFacet != null) {
+//            if(underlyingFacet instanceof MultiTypedFacet) {
+//                val multiTypedFacet = (MultiTypedFacet) underlyingFacet;
+//                val matches = compatible(multiTypedFacet);
+//                if(!matches) {
+//                    throw new IllegalArgumentException("illegal argument, expected underlying facet (a multi-valued facet) to have equivalent to the facet type (or facet types) of this facet");
+//                }
+//            } else {
+                
+                val underlyingFacetType = underlyingFacet.facetType();
+                if(!Objects.equals(underlyingFacetType, facetType)) {
+                    val msg = String.format(
+                            "type-missmatch: underlying facet's type '%s' "
+                            + "must match this facet's type '%s'", 
+                            underlyingFacetType, facetType);
+                    throw _Exceptions.unrecoverable(msg);
+                }
+ 
+ //           }
+        }
+        this.underlyingFacet = underlyingFacet;
+    }
+
+//    private boolean compatible(final MultiTypedFacet multiTypedFacet) {
+//
+//        if (!(this instanceof MultiTypedFacet)) {
+//            return multiTypedFacet.containsFacetTypeOf(this.facetType);
+//        }
+//
+//        val thisAsMultiTyped = (MultiTypedFacet) this;
+//        
+//        return thisAsMultiTyped.facetTypes()
+//                .anyMatch(multiTypedFacet::containsFacetTypeOf);
+//    }
+
+    /**
+     * Assume implementation is <i>not</i> a no-op.
+     *
+     * <p>
+     * No-op implementations should override and return <tt>true</tt>.
+     */
+    @Override
+    public boolean isFallback() {
+        return false;
+    }
+
+    /**
+     * Default implementation of this method that returns <tt>true</tt>, ie
+     * should replace (none {@link #isFallback() no-op} implementations.
+     *
+     * <p>
+     * Implementations that don't wish to replace none no-op implementations
+     * should override and return <tt>false</tt>.
+     */
+    @Override
+    public boolean alwaysReplace() {
+        return true;
+    }
+
+    @Override
+    public void setFacetHolder(final FacetHolder facetHolder) {
+        this.holder = facetHolder;
+        this.identifiedHolder = (holder!=null && holder instanceof IdentifiedHolder) 
+                ? (IdentifiedHolder) holder 
+                        : null;
+    }
+
+    protected String toStringValues() {
+        return "";
+    }
+
+    @Override
+    public String toString() {
+        String details = "";
+        if (isValidating()) {
+            details += "Validating";
+        }
+        if (isDisabling()) {
+            details += (details.length() > 0 ? ";" : "") + "Disabling";
+        }
+        if (isHiding()) {
+            details += (details.length() > 0 ? ";" : "") + "Hiding";
+        }
+        if (!"".equals(details)) {
+            details = "interaction=" + details + ",";
+        }
+
+        final String className = getClass().getName();
+        final String stringValues = toStringValues();
+        if (getClass() != facetType()) {
+            final String facetType = facetType().getName();
+            details += "type=" + facetType.substring(facetType.lastIndexOf('.') + 1);
+        }
+        if (!"".equals(stringValues)) {
+            details += ",";
+        }
+        return className.substring(className.lastIndexOf('.') + 1) + "[" + details + stringValues + "]";
+    }
+
+    private boolean isHiding() {
+        return Hiding.class.isAssignableFrom(getClass());
+    }
+
+    private boolean isDisabling() {
+        return Disabling.class.isAssignableFrom(getClass());
+    }
+
+    private boolean isValidating() {
+        return Validating.class.isAssignableFrom(getClass());
+    }
+
+    @Override
+    public void appendAttributesTo(final Map<String, Object> attributeMap) {
+        if(derived) {
+            attributeMap.put("derived", derived);
+        }
+        attributeMap.put("underlyingFacet", underlyingFacet);
+        if(isFallback()) {
+            attributeMap.put("noop", isFallback());
+        }
+        if(isHiding()) {
+            attributeMap.put("hiding", isHiding());
+        }
+        if(isDisabling()) {
+            attributeMap.put("disabling", isDisabling());
+        }
+        if(isValidating()) {
+            attributeMap.put("validating", isValidating());
+        }
+    }
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Hiding {
+    }
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Disabling {
+    }
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Validating {
+    }
+
+    // -- CONTRIBUTED FACET SUPPORT
+    
+    @Override
+    public void addContributedFacet(Facet contributedFacet) {
+        if(contributedFacets==null) {
+            contributedFacets = _Sets.newHashSet();
+        }
+        contributedFacets.add(contributedFacet);
+    }
+    
+    @Override
+    public void forEachContributedFacet(Consumer<Facet> onContributedFacet) {
+        if(contributedFacets!=null) {
+            contributedFacets.forEach(onContributedFacet);
+        }
+    }
+
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
new file mode 100644
index 0000000..075e1b9
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
@@ -0,0 +1,150 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.stream.Stream;
+
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+
+import lombok.val;
+
+/**
+ * Anything in the metamodel (which also includes peers in the reflector) that
+ * can be extended.
+ */
+public interface FacetHolder {
+
+    int getFacetCount();
+
+    /**
+     * Get the facet of the specified type (as per the type it reports from
+     * {@link Facet#facetType()}).
+     */
+    <T extends Facet> T getFacet(Class<T> cls);
+
+    /**
+     * Whether there is a facet registered of the specified type.
+     */
+    boolean containsFacet(Class<? extends Facet> facetType);
+
+    /**
+     * Whether there is a facet registered of the specified type that is not a
+     * {@link Facet#isFallback() fallback} .
+     * <p>
+     * Convenience; saves having to {@link #getFacet(Class)} and then check if
+     * <tt>null</tt> and not a fallback.
+     */
+    default boolean containsNonFallbackFacet(Class<? extends Facet> facetType) {
+        val facet = getFacet(facetType);
+        return facet != null && !facet.isFallback();
+    }
+
+    /**
+     * As {@link #containsNonFallbackFacet(Class)}, with additional requirement, that the
+     * facet is <i>explicit</i>, not {@link Facet#isDerived() derived}.
+     */
+    default boolean containsExplicitNonFallbackFacet(Class<? extends Facet> facetType) {
+        val facet = getFacet(facetType);
+        return facet != null && !facet.isFallback() && !facet.isDerived();
+    }
+
+    Stream<Facet> streamFacets();
+    
+    default <F extends Facet> Stream<F> streamFacets(Class<F> requiredType) {
+        return streamFacets()
+                .filter(facet->requiredType.isAssignableFrom(facet.getClass()))
+                .map(requiredType::cast);
+    }
+
+    /**
+     * Adds the facet, extracting its {@link Facet#facetType() type} as the key.
+     *
+     * <p>
+     * If there are any facet of the same type, they will be overwritten
+     * <i>provided</i> that either the {@link Facet} specifies to
+     * {@link Facet#alwaysReplace() always replace} or if the existing
+     * {@link Facet} is a {@link Facet#isFallback() no-op}.
+     */
+    void addFacet(Facet facet);
+
+    /**
+     * Replaces any existing facet with the given one, while copying any underlying 
+     * facet from the existing to the given one.
+     * 
+     * @param facet
+     * @since 2.0
+     */
+    void addOrReplaceFacet(Facet facet);
+    
+    /**
+     * 
+     * @since 2.0
+     */
+    MetaModelContext getMetaModelContext();
+
+    /**
+     * For those that implement through delegation.
+     * @since 2.0
+     *
+     */
+    public static interface Delegating extends FacetHolder {
+        
+        FacetHolder getFacetHolder();
+
+        @Override
+        default public int getFacetCount() {
+            return getFacetHolder().getFacetCount();
+        }
+
+        @Override
+        default public <T extends Facet> T getFacet(Class<T> cls) {
+            return getFacetHolder().getFacet(cls);
+        }
+
+        @Override
+        default public boolean containsFacet(Class<? extends Facet> facetType) {
+            return getFacetHolder().containsFacet(facetType);
+        }
+
+        @Override
+        default public Stream<Facet> streamFacets() {
+            return getFacetHolder().streamFacets();
+        }
+
+        @Override
+        default public void addFacet(Facet facet) {
+            getFacetHolder().addFacet(facet);
+        }
+
+        @Override
+        default public void addOrReplaceFacet(Facet facet) {
+            getFacetHolder().addOrReplaceFacet(facet);
+        }
+
+        @Override
+        default public MetaModelContext getMetaModelContext() {
+            return getFacetHolder().getMetaModelContext();
+        }
+        
+        
+    }
+    
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
new file mode 100644
index 0000000..bb07a90
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
@@ -0,0 +1,168 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps.AliasMap;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.core.metamodel.context.MetaModelContextAware;
+
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.val;
+
+/**
+ * For base subclasses or, more likely, to help write tests.
+ */
+public class FacetHolderImpl implements FacetHolder, MetaModelContextAware {
+
+    @Getter(onMethod = @__(@Override)) @Setter(onMethod = @__(@Override))
+    private MetaModelContext metaModelContext;
+    
+    private final Map<Class<? extends Facet>, Facet> facetsByType = _Maps.newHashMap();
+    private final Object $lock = new Object();
+    
+    @Override
+    public boolean containsFacet(Class<? extends Facet> facetType) {
+        synchronized($lock) {
+            return snapshot.get().containsKey(facetType);
+        }
+    }
+
+    @Override
+    public void addFacet(Facet facet) {
+        synchronized($lock) {
+            val changed = addFacetOrKeepExisting(facetsByType, facet);
+            if(changed) {
+                snapshot.clear(); //invalidate
+            }
+        }
+    }
+
+    @Override
+    public <T extends Facet> T getFacet(Class<T> facetType) {
+        synchronized($lock) {
+            return uncheckedCast(snapshot.get().get(facetType));
+        }
+    }
+
+    @Override
+    public Stream<Facet> streamFacets() {
+        synchronized($lock) {
+            return snapshot.get().values().stream(); // consumers should play nice and don't take too long  
+        }
+    }
+
+    @Override
+    public int getFacetCount() {
+        synchronized($lock) {
+            return snapshot.get().size();    
+        }
+    }
+    
+    @Override
+    public void addOrReplaceFacet(Facet facet) {
+        synchronized($lock) {
+            val facetType = facet.facetType();
+            val existingFacet = getFacet(facetType);
+            if (existingFacet != null) {
+                remove(existingFacet);
+                val underlyingFacet = existingFacet.getUnderlyingFacet();
+                facet.setUnderlyingFacet(underlyingFacet);
+            }
+            
+            addFacet(facet);
+        }
+    }
+
+    // -- HELPER
+    
+    private final _Lazy<Map<Class<? extends Facet>, Facet>> snapshot = _Lazy.threadSafe(this::snapshot);
+
+    // collect all facet information provided with the top-level facets (contributed facets and aliases)
+    private Map<Class<? extends Facet>, Facet> snapshot() {
+        val snapshot = _Maps.<Class<? extends Facet>, Facet>newAliasMap(HashMap::new);
+        facetsByType.values().forEach(topLevelFacet->{
+             
+            snapshot.remap(
+                    topLevelFacet.facetType(), 
+                    Can.ofNullable(topLevelFacet.facetAliasType()), 
+                    topLevelFacet);
+
+            // honor contributed facets via recursive lookup
+            collectChildren(snapshot, topLevelFacet);
+
+
+        });
+        return snapshot;
+    }
+
+    private void collectChildren(AliasMap<Class<? extends Facet>, Facet> target, Facet parentFacet) {
+        parentFacet.forEachContributedFacet(child->{
+            val added = addFacetOrKeepExisting(target, child);
+            if(added) {
+                collectChildren(target, child); 
+            }
+        });        
+    }
+
+    private boolean addFacetOrKeepExisting(
+            Map<Class<? extends Facet>, Facet> facetsByType,
+            Facet facet) {
+        
+        val existingFacet = facetsByType.get(facet.facetType());
+        
+        val addOrKeep = whichPrecedesTheOther(existingFacet, facet);
+        if(addOrKeep==facet) {
+            facetsByType.put(facet.facetType(), facet);
+            return true;
+        }
+        return false;
+    }
+    
+    private void remove(Facet topLevelFacet) {
+        snapshot.clear(); //invalidate
+        facetsByType.remove(topLevelFacet.facetType());
+    }
+    
+    // also has side-effects (not really suggested by the naming)
+    private Facet whichPrecedesTheOther(Facet existingFacet, Facet facet) {
+        if (existingFacet == null || existingFacet.isFallback()) {
+            return facet;
+        }
+        if (!facet.alwaysReplace()) {
+            return existingFacet; //eg. ValueSemanticsProviderAndFacetAbstract is alwaysReplace=false
+        }
+        if (facet.isDerived() && !existingFacet.isDerived()) {
+            return existingFacet;
+        }
+        facet.setUnderlyingFacet(existingFacet);
+        return facet;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
new file mode 100644
index 0000000..3a1bd13
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
@@ -0,0 +1,96 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+
+import org.apache.isis.core.metamodel.util.snapshot.XmlSchema;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.val;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class FacetUtil {
+
+
+    public static void addOrReplaceFacet(final Facet facet) {
+        if (facet == null) {
+            return;
+        }
+        val facetHolder = facet.getFacetHolder();
+        facetHolder.addOrReplaceFacet(facet);
+    }
+
+    /**
+     * Attaches the {@link Facet} to its {@link Facet#getFacetHolder() facet
+     * holder}.
+     *
+     * @return <tt>true</tt> if a non-<tt>null</tt> facet was added,
+     *         <tt>false</tt> otherwise.
+     */
+    public static boolean addFacet(final Facet facet) {
+        if (facet == null) {
+            return false;
+        }
+        facet.getFacetHolder().addFacet(facet);
+        return true;
+    }
+
+    /**
+     * Attaches each {@link Facet} to its {@link Facet#getFacetHolder() facet
+     * holder}.
+     *
+     * @return <tt>true</tt> if any facets were added, <tt>false</tt> otherwise.
+     */
+    public static boolean addFacets(final List<Facet> facetList) {
+        boolean addedFacets = false;
+        for (val facet : facetList) {
+            addedFacets = addFacet(facet) | addedFacets;
+        }
+        return addedFacets;
+    }
+
+    public static <T extends Facet> XmlSchema.ExtensionData<T> getFacetsByType(final FacetHolder facetHolder) {
+
+        return new XmlSchema.ExtensionData<T>() {
+
+            @Override
+            public int size() {
+                return facetHolder.getFacetCount();
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public void visit(BiConsumer<Class<T>, T> elementConsumer) {
+                facetHolder.streamFacets()
+                .forEach(facet->elementConsumer.accept((Class<T>)facet.facetType(), (T)facet));
+            }
+
+        };
+    }
+
+    public static void copyFacets(final FacetHolder source, final FacetHolder target) {
+        source.streamFacets()
+        .forEach(target::addFacet);
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetWithAttributes.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetWithAttributes.java
new file mode 100644
index 0000000..72d31a8
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetWithAttributes.java
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.util.Map;
+
+import org.apache.isis.applib.services.metamodel.MetaModelService;
+
+/**
+ * For serialization of metamodel into XML, see {@link org.apache.isis.applib.services.metamodel.MetaModelService#exportMetaModel(MetaModelService.Config)}.
+ */
+public interface FacetWithAttributes {
+
+    void appendAttributesTo(Map<String,Object> attributeMap);
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
new file mode 100644
index 0000000..742e222
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
@@ -0,0 +1,159 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facetapi;
+
+import java.beans.Introspector;
+import java.lang.reflect.Method;
+import java.util.EnumSet;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.commons.StringExtensions;
+
+/**
+ * Enumerates the features that a particular Facet can be applied to.
+ *
+ * <p>
+ * The class-level feature processing is typically performed by {@link FacetFactory}s
+ * pertaining to {@link #OBJECT}, performed before the processing of class members.
+ *
+ */
+public enum FeatureType {
+
+    OBJECT("Object") {
+        /**
+         * The supplied method can be null; at any rate it will be ignored.
+         */
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            return Identifier.classIdentifier(type);
+        }
+    },
+    PROPERTY("Property") {
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            return propertyOrCollectionIdentifierFor(type, method);
+        }
+    },
+    COLLECTION("Collection") {
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            return propertyOrCollectionIdentifierFor(type, method);
+        }
+    },
+    ACTION("Action") {
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            final String fullMethodName = method.getName();
+            final Class<?>[] parameterTypes = method.getParameterTypes();
+            return Identifier.actionIdentifier(type.getName(), fullMethodName, parameterTypes);
+        }
+    },
+    ACTION_PARAMETER_SCALAR("Scalar Parameter") {
+        /**
+         * Always returns <tt>null</tt>.
+         */
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            return null;
+        }
+    },
+    ACTION_PARAMETER_COLLECTION("Collection Parameter") {
+        /**
+         * Always returns <tt>null</tt>.
+         */
+        @Override
+        public Identifier identifierFor(final Class<?> type, final Method method) {
+            return null;
+        }
+    };
+
+    public final static EnumSet<FeatureType> COLLECTIONS_ONLY = EnumSet.of(COLLECTION);
+    public final static EnumSet<FeatureType> COLLECTIONS_AND_ACTIONS = EnumSet.of(COLLECTION, ACTION);
+    public final static EnumSet<FeatureType> ACTIONS_ONLY = EnumSet.of(ACTION);
+    public final static EnumSet<FeatureType> PARAMETERS_ONLY = EnumSet.of(ACTION_PARAMETER_SCALAR, ACTION_PARAMETER_COLLECTION);
+    public final static EnumSet<FeatureType> PROPERTIES_ONLY = EnumSet.of(PROPERTY);
+    public final static EnumSet<FeatureType> PROPERTIES_AND_ACTIONS = EnumSet.of(PROPERTY, ACTION);
+    public final static EnumSet<FeatureType> OBJECTS_ONLY = EnumSet.of(OBJECT);
+    public final static EnumSet<FeatureType> MEMBERS = EnumSet.of(PROPERTY, COLLECTION, ACTION);
+    public final static EnumSet<FeatureType> OBJECTS_AND_PROPERTIES = EnumSet.of(OBJECT, PROPERTY);
+    public final static EnumSet<FeatureType> PROPERTIES_AND_COLLECTIONS = EnumSet.of(PROPERTY, COLLECTION);
+    public final static EnumSet<FeatureType> OBJECTS_AND_COLLECTIONS = EnumSet.of(OBJECT, COLLECTION);
+    public final static EnumSet<FeatureType> OBJECTS_AND_ACTIONS = EnumSet.of(OBJECT, ACTION);
+    public final static EnumSet<FeatureType> OBJECTS_PROPERTIES_AND_COLLECTIONS = EnumSet.of(OBJECT, PROPERTY, COLLECTION);
+    public static final EnumSet<FeatureType> ACTIONS_AND_PARAMETERS =
+            EnumSet.of(ACTION, ACTION_PARAMETER_SCALAR, ACTION_PARAMETER_COLLECTION);
+
+    /**
+     * Use of this is discouraged; instead use multiple {@link FacetFactory}s
+     * for different features.
+     */
+    public final static EnumSet<FeatureType> EVERYTHING_BUT_PARAMETERS = 
+            EnumSet.complementOf(
+                    EnumSet.of(ACTION_PARAMETER_SCALAR, ACTION_PARAMETER_COLLECTION));
+    /**
+     * Use of this is discouraged; instead use multiple {@link FacetFactory}s
+     * for different features.
+     */
+    public final static EnumSet<FeatureType> EVERYTHING = EnumSet.allOf(FeatureType.class); 
+
+    private final String name;
+
+    private FeatureType(final String name) {
+        this.name = name;
+    }
+
+    private static Identifier propertyOrCollectionIdentifierFor(final Class<?> type, final Method method) {
+        final String capitalizedName = StringExtensions.asJavaBaseName(method.getName());
+        final String beanName = Introspector.decapitalize(capitalizedName);
+        return Identifier.propertyOrCollectionIdentifier(type.getName(), beanName);
+    }
+
+    public boolean isProperty() {
+        return this == PROPERTY;
+    }
+
+    public boolean isCollection() {
+        return this == COLLECTION;
+    }
+
+    public boolean isAction() {
+        return this == ACTION;
+    }
+
+    public boolean isActionParameter() {
+        return this == ACTION_PARAMETER_SCALAR || this == ACTION_PARAMETER_COLLECTION;
+    }
+
+    /**
+     * Convenience.
+     */
+    public boolean isPropertyOrCollection() {
+        return isProperty() || isCollection();
+    }
+
+    public abstract Identifier identifierFor(Class<?> type, Method method);
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java
new file mode 100644
index 0000000..a89b429
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java
@@ -0,0 +1,31 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
... 255674 lines suppressed ...


[isis] 16/21: ISIS-2259: fixes module class names for core-codegen-bytebuddy and core-commons

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

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

commit 41d6458c4ca71c99ccf639034122437e9aa933f0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:09:19 2020 +0000

    ISIS-2259: fixes module class names for core-codegen-bytebuddy and core-commons
---
 ...sisModuleCodegenByteBuddy.java => IsisModuleCoreCodegenByteBuddy.java} | 0
 .../core/commons/{IsisModuleCommons.java => IsisModuleCoreCommons.java}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
similarity index 100%
rename from core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
rename to core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java


[isis] 13/21: ISIS-2259: moves core/viewers up a level.

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

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

commit 2074ec107287622d1cca7941b5b93b35c79d063f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:59:03 2020 +0000

    ISIS-2259: moves core/viewers up a level.
---
 core/pom.xml                                                |   4 ++--
 {core/viewers => viewers}/restfulobjects/applib/pom.xml     |   0
 .../applib/IsisModuleRestfulObjectsApplib.java              |   0
 .../viewer/restfulobjects/applib/JsonRepresentation.java    |   0
 .../viewer/restfulobjects/applib/LinkRepresentation.java    |   0
 .../org/apache/isis/viewer/restfulobjects/applib/Rel.java   |   0
 .../isis/viewer/restfulobjects/applib/RelDefinition.java    |   0
 .../viewer/restfulobjects/applib/RepresentationType.java    |   0
 .../viewer/restfulobjects/applib/RestfulHttpMethod.java     |   0
 .../isis/viewer/restfulobjects/applib/RestfulMediaType.java |   0
 .../isis/viewer/restfulobjects/applib/RestfulRequest.java   |   0
 .../isis/viewer/restfulobjects/applib/RestfulResponse.java  |   0
 .../restfulobjects/applib/boot/BootstrapResource.java       |   0
 .../domainobjects/AbstractObjectMemberRepresentation.java   |   0
 .../applib/domainobjects/ActionResultRepresentation.java    |   0
 .../domainobjects/DomainObjectMemberRepresentation.java     |   0
 .../applib/domainobjects/DomainObjectRepresentation.java    |   0
 .../applib/domainobjects/DomainObjectResource.java          |   0
 .../applib/domainobjects/DomainRepresentation.java          |   0
 .../applib/domainobjects/DomainServiceResource.java         |   0
 .../applib/domainobjects/ListRepresentation.java            |   0
 .../applib/domainobjects/ObjectActionRepresentation.java    |   0
 .../domainobjects/ObjectCollectionRepresentation.java       |   0
 .../applib/domainobjects/ObjectPropertyRepresentation.java  |   0
 .../applib/domainobjects/ScalarValueRepresentation.java     |   0
 .../domaintypes/AbstractTypeMemberRepresentation.java       |   0
 .../applib/domaintypes/ActionDescriptionRepresentation.java |   0
 .../ActionParameterDescriptionRepresentation.java           |   0
 .../domaintypes/CollectionDescriptionRepresentation.java    |   0
 .../applib/domaintypes/DomainTypeRepresentation.java        |   0
 .../applib/domaintypes/DomainTypeResource.java              |   0
 .../domaintypes/PropertyDescriptionRepresentation.java      |   0
 .../applib/domaintypes/TypeActionResultRepresentation.java  |   0
 .../applib/domaintypes/TypeListRepresentation.java          |   0
 .../restfulobjects/applib/errors/ErrorRepresentation.java   |   0
 .../restfulobjects/applib/health/HealthRepresentation.java  |   0
 .../viewer/restfulobjects/applib/health/HealthResource.java |   0
 .../applib/homepage/HomePageRepresentation.java             |   0
 .../restfulobjects/applib/homepage/HomePageResource.java    |   0
 .../restfulobjects/applib/menubars/MenuBarsResource.java    |   0
 .../restfulobjects/applib/user/UserRepresentation.java      |   0
 .../viewer/restfulobjects/applib/user/UserResource.java     |   0
 .../isis/viewer/restfulobjects/applib/util/JsonMapper.java  |   0
 .../viewer/restfulobjects/applib/util/JsonNodeUtils.java    |   0
 .../isis/viewer/restfulobjects/applib/util/MediaTypes.java  |   0
 .../isis/viewer/restfulobjects/applib/util/Parser.java      |   0
 .../isis/viewer/restfulobjects/applib/util/PathNode.java    |   0
 .../viewer/restfulobjects/applib/util/UrlEncodingUtils.java |   0
 .../applib/version/VersionRepresentation.java               |   0
 .../restfulobjects/applib/version/VersionResource.java      |   0
 ...sis.viewer.restfulobjects.applib.client.UriBuilderPlugin |   0
 .../isis/viewer/restfulobjects/applib/JsonFixture.java      |   0
 .../JsonRepresentationTest_arrayGet_arraySetElementAt.java  |   0
 .../applib/JsonRepresentationTest_asInputStream.java        |   0
 .../applib/JsonRepresentationTest_getArray.java             |   0
 .../applib/JsonRepresentationTest_getBigDecimal.java        |   0
 .../applib/JsonRepresentationTest_getBigInteger.java        |   0
 .../applib/JsonRepresentationTest_getBoolean.java           |   0
 .../applib/JsonRepresentationTest_getDouble.java            |   0
 .../applib/JsonRepresentationTest_getInt.java               |   0
 .../applib/JsonRepresentationTest_getLink_isLink.java       |   0
 .../applib/JsonRepresentationTest_getLong.java              |   0
 .../applib/JsonRepresentationTest_getNull_isNull.java       |   0
 .../applib/JsonRepresentationTest_getRepresentation.java    |   0
 .../applib/JsonRepresentationTest_getString_isString.java   |   0
 .../JsonRepresentationTest_isArray_isMap_isValue.java       |   0
 .../applib/JsonRepresentationTest_mapHas.java               |   0
 .../applib/JsonRepresentationTest_newArray.java             |   0
 .../applib/JsonRepresentationTest_newObject.java            |   0
 .../applib/JsonRepresentationTest_putXxx.java               |   0
 .../restfulobjects/applib/JsonRepresentationTest_size.java  |   0
 .../applib/JsonRepresentationTest_streamArrayElements.java  |   0
 .../applib/JsonRepresentationTest_streamMapEntries.java     |   0
 .../applib/JsonRepresentationTest_urlEncoding.java          |   0
 .../applib/LinkRepresentationTest_equals.java               |   0
 .../isis/viewer/restfulobjects/applib/Rel_getName_Test.java |   0
 .../RepresentationTypeTest_getMediaType_ContractTest.java   |   0
 .../applib/RepresentationTypeTest_getName_ContractTest.java |   0
 .../applib/RepresentationTypeTest_lookup_ContractTest.java  |   0
 .../applib/RepresentationTypeTest_parser_ContractTest.java  |   0
 .../client/RestfulRequest_DomainModelTest_parser.java       |   0
 ...Request_RequestParameterTest_valueOf_xrodomainmodel.java |   0
 ...Request_RequestParameterTest_valueOf_xrofollowlinks.java |   0
 .../applib/client/RestfulResponse_HeaderTest_Warning.java   |   0
 .../applib/client/RestfulResponse_HttpStatusCodeTest.java   |   0
 .../DomainObjectRepresentationTest_getCollection.java       |   0
 .../DomainObjectRepresentationTest_getCollections.java      |   0
 .../DomainObjectRepresentationTest_getProperties.java       |   0
 .../DomainObjectRepresentationTest_getProperty.java         |   0
 .../isis/viewer/restfulobjects/applib/util/Parser_Test.java |   0
 .../applib/util/Parser_forCacheControl_ContractTest.java    |   0
 .../applib/util/Parser_forJaxRsMediaType_ContractTest.java  |   0
 .../applib/util/PathNodeTest_equalsHashcode.java            |   0
 .../restfulobjects/applib/util/PathNodeTest_parse.java      |   0
 .../restfulobjects/applib/util/PathNodeTest_split.java      |   0
 .../restfulobjects/applib/domainObjectRepresentation.json   |   0
 .../apache/isis/viewer/restfulobjects/applib/emptyList.json |   0
 .../apache/isis/viewer/restfulobjects/applib/emptyMap.json  |   0
 .../org/apache/isis/viewer/restfulobjects/applib/list.json  |   0
 .../isis/viewer/restfulobjects/applib/listOfStrings.json    |   0
 .../org/apache/isis/viewer/restfulobjects/applib/map.json   |   0
 .../isis/viewer/restfulobjects/applib/servicesList.json     |   0
 .../restfulobjects/jaxrs-resteasy-4/.gitignore              |   0
 .../restfulobjects/jaxrs-resteasy-4/pom.xml                 |   0
 .../restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml |   0
 .../main/doc/modules/jaxrs-resteasy-4/attachments}/.gitkeep |   0
 .../main/doc/modules/jaxrs-resteasy-4/examples/.gitignore   |   0
 .../src/main/doc/modules/jaxrs-resteasy-4/images}/.gitkeep  |   0
 .../src/main/doc/modules/jaxrs-resteasy-4/nav.adoc          |   0
 .../src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc  |   0
 .../doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc   |   0
 .../IsisModuleRestfulObjectsJaxrsResteasy4.java             |   0
 .../conneg/RestfulObjectsJaxbWriterForXml.java              |   0
 .../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java   |   0
 .../jaxrsresteasy4/Parser_forCacheControl_Test.java         |   0
 .../jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java       |   0
 .../jaxrsresteasy4/RepresentationTypeTest_getMediaType.java |   0
 .../jaxrsresteasy4/RepresentationTypeTest_getName.java      |   0
 .../jaxrsresteasy4/RepresentationTypeTest_lookup.java       |   0
 .../jaxrsresteasy4/RepresentationTypeTest_parser.java       |   0
 .../ResourceContext_ensureCompatibleAcceptHeader_Test.java  |   0
 .../RestfulObjectsApplicationExceptionMapper_Test.java      |   0
 {core/viewers => viewers}/restfulobjects/pom.xml            |   2 +-
 {core/viewers => viewers}/restfulobjects/rendering/pom.xml  |   0
 .../isis/viewer/restfulobjects/rendering/Caching.java       |   0
 .../viewer/restfulobjects/rendering/ExceptionWithBody.java  |   0
 .../rendering/ExceptionWithHttpStatusCode.java              |   0
 .../viewer/restfulobjects/rendering/IResourceContext.java   |   0
 .../rendering/IsisModuleRestfulObjectsRendering.java        |   0
 .../isis/viewer/restfulobjects/rendering/LinkBuilder.java   |   0
 .../viewer/restfulobjects/rendering/LinkFollowSpecs.java    |   0
 .../isis/viewer/restfulobjects/rendering/OidUtils.java      |   0
 .../viewer/restfulobjects/rendering/RendererFactory.java    |   0
 .../isis/viewer/restfulobjects/rendering/ReprRenderer.java  |   0
 .../restfulobjects/rendering/ReprRendererAbstract.java      |   0
 .../restfulobjects/rendering/ReprRendererException.java     |   0
 .../isis/viewer/restfulobjects/rendering/Responses.java     |   0
 .../rendering/RestfulObjectsApplicationException.java       |   0
 .../viewer/restfulobjects/rendering/UrlDecoderUtils.java    |   0
 .../domainobjects/AbstractObjectMemberReprRenderer.java     |   0
 .../rendering/domainobjects/ActionResultReprRenderer.java   |   0
 .../restfulobjects/rendering/domainobjects/BodyArgs.java    |   0
 .../rendering/domainobjects/CollectionSemantics.java        |   0
 .../rendering/domainobjects/DomainObjectLinkTo.java         |   0
 .../rendering/domainobjects/DomainObjectReprRenderer.java   |   0
 .../rendering/domainobjects/DomainServiceLinkTo.java        |   0
 .../restfulobjects/rendering/domainobjects/InvokeKeys.java  |   0
 .../rendering/domainobjects/JsonValueEncoder.java           |   0
 .../domainobjects/JsonValueEncoder_Converters.java          |   0
 .../rendering/domainobjects/ListReprRenderer.java           |   0
 .../rendering/domainobjects/MemberReprMode.java             |   0
 .../restfulobjects/rendering/domainobjects/MemberType.java  |   0
 .../restfulobjects/rendering/domainobjects/MutatorSpec.java |   0
 .../rendering/domainobjects/ObjectActionReprRenderer.java   |   0
 .../rendering/domainobjects/ObjectAdapterLinkTo.java        |   0
 .../rendering/domainobjects/ObjectAndAction.java            |   0
 .../rendering/domainobjects/ObjectAndActionInvocation.java  |   0
 .../rendering/domainobjects/ObjectAndCollection.java        |   0
 .../rendering/domainobjects/ObjectAndCollection2.java       |   0
 .../rendering/domainobjects/ObjectAndMember.java            |   0
 .../rendering/domainobjects/ObjectAndProperty.java          |   0
 .../rendering/domainobjects/ObjectAndProperty2.java         |   0
 .../domainobjects/ObjectCollectionReprRenderer.java         |   0
 .../rendering/domainobjects/ObjectPropertyReprRenderer.java |   0
 .../rendering/domainobjects/ScalarValueReprRenderer.java    |   0
 .../domaintypes/AbstractTypeFeatureReprRenderer.java        |   0
 .../domaintypes/AbstractTypeMemberReprRenderer.java         |   0
 .../domaintypes/ActionDescriptionReprRenderer.java          |   0
 .../domaintypes/ActionParameterDescriptionReprRenderer.java |   0
 .../domaintypes/CollectionDescriptionReprRenderer.java      |   0
 .../rendering/domaintypes/DomainTypeReprRenderer.java       |   0
 .../rendering/domaintypes/ObjectSpecAndSuperSpec.java       |   0
 .../rendering/domaintypes/ParentSpecAndAction.java          |   0
 .../rendering/domaintypes/ParentSpecAndActionParam.java     |   0
 .../rendering/domaintypes/ParentSpecAndCollection.java      |   0
 .../rendering/domaintypes/ParentSpecAndFeature.java         |   0
 .../rendering/domaintypes/ParentSpecAndProperty.java        |   0
 .../domaintypes/PropertyDescriptionReprRenderer.java        |   0
 .../rendering/domaintypes/TypeActionResultReprRenderer.java |   0
 .../rendering/domaintypes/TypeListReprRenderer.java         |   0
 .../rendering/service/RepresentationService.java            |   0
 .../service/RepresentationServiceContentNegotiator.java     |   0
 .../service/acceptheader/AcceptHeaderServiceForRest.java    |   0
 .../rendering/service/conneg/ContentNegotiationService.java |   0
 .../service/conneg/ContentNegotiationServiceAbstract.java   |   0
 .../ContentNegotiationServiceForRestfulObjectsV1_0.java     |   0
 .../conneg/ContentNegotiationServiceOrgApacheIsisV1.java    |   0
 .../conneg/ContentNegotiationServiceXRoDomainType.java      |   0
 .../rendering/service/swagger/SwaggerServiceDefault.java    |   0
 .../rendering/service/swagger/SwaggerServiceMenu.java       |   0
 .../rendering/service/swagger/internal/Caching.java         |   0
 .../rendering/service/swagger/internal/ClassExcluder.java   |   0
 .../service/swagger/internal/ClassExcluderAbstract.java     |   0
 .../service/swagger/internal/ClassExcluderDefault.java      |   0
 .../rendering/service/swagger/internal/Generation.java      |   0
 .../service/swagger/internal/SwaggerSpecGenerator.java      |   0
 .../rendering/service/swagger/internal/Tagger.java          |   0
 .../rendering/service/swagger/internal/TaggerDefault.java   |   0
 .../rendering/service/swagger/internal/Util.java            |   0
 .../service/swagger/internal/ValuePropertyFactory.java      |   0
 .../swagger/internal/ValuePropertyFactoryDefault.java       |   0
 .../service/swagger/internal/ValuePropertyPlugin.java       |   0
 .../restfulobjects/rendering/util/FollowSpecUtil.java       |   0
 .../restfulobjects/rendering/util/JsonWriterUtil.java       |   0
 .../viewer/restfulobjects/rendering/util/ListUtils.java     |   0
 .../isis/viewer/restfulobjects/rendering/util/MapUtils.java |   0
 .../isis/viewer/restfulobjects/rendering/util/Util.java     |   0
 .../rendering/LinkFollowSpecsTest_follow.java               |   0
 .../JsonValueEncoderTest_appendValueAndFormat.java          |   0
 .../domainobjects/JsonValueEncoderTest_asAdapter.java       |   0
 .../domainobjects/JsonValueEncoderTest_asObject.java        |   0
 .../rendering/service/swagger/internal/GenerationTest.java  |   0
 .../rendering/service/swagger/internal/TaggerTest.java      |   0
 .../viewer/restfulobjects/rendering/util/MapUtilsTest.java  |   0
 .../restfulobjects/src/main/doc/antora.yml                  |   0
 .../ro-spec-resources-and-representations.png               | Bin
 .../modules/ROOT/images/rgfis/service-collaborations.png    | Bin
 .../restfulobjects/src/main/doc/modules/ROOT/nav.adoc       |   0
 .../src/main/doc/modules/ROOT/pages/about.adoc              |   0
 .../src/main/doc/modules/ROOT/pages/architecture.adoc       |   0
 .../doc/modules/ROOT/pages/configuration-properties.adoc    |   0
 .../src/main/doc/modules/ROOT/pages/health-check.adoc       |   0
 .../src/main/doc/modules/ROOT/pages/hints-and-tips.adoc     |   0
 .../doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc |   0
 .../modules/ROOT/pages/hints-and-tips/pretty-printing.adoc  |   0
 .../ROOT/pages/hints-and-tips/restful-image-property.adoc   |   0
 .../modules/ROOT/pages/hints-and-tips/troubleshooting.adoc  |   0
 .../ROOT/pages/hints-and-tips/using-chrome-devtools.adoc    |   0
 .../ROOT/pages/hints-and-tips/view-model-as-parameter.adoc  |   0
 .../src/main/doc/modules/ROOT/pages/layout-resources.adoc   |   0
 .../src/main/doc/modules/ROOT/pages/ro-spec.adoc            |   0
 .../src/main/doc/modules/ROOT/pages/security.adoc           |   0
 .../doc/modules/ROOT/pages/simplified-representations.adoc  |   0
 .../pages/simplified-representations/action-invocation.adoc |   0
 .../simplified-representations/apache-isis-profile.adoc     |   0
 .../configuration-properties.adoc                           |   0
 .../pages/simplified-representations/domain-object.adoc     |   0
 .../pages/simplified-representations/object-collection.adoc |   0
 .../simplified-representations/other-representations.adoc   |   0
 .../src/main/doc/modules/ROOT/partials/component-nav.adoc   |   0
 .../src/main/doc/modules/ROOT/partials/module-nav.adoc      |   0
 .../modules/ROOT/partials/security/user-registration.adoc   |   0
 .../main/doc/modules/ROOT/partials/security/web-xml.adoc    |   0
 {core/viewers => viewers}/restfulobjects/viewer/pom.xml     |   0
 .../viewer/IsisModuleRestfulObjectsViewer.java              |   0
 .../restfulobjects/viewer/context/ResourceContext.java      |   0
 .../restfulobjects/viewer/jaxrsapp/RestfulObjectsSpec.java  |   0
 .../viewer/mappers/ExceptionMapperAbstract.java             |   0
 .../viewer/mappers/ExceptionMapperForObjectNotFound.java    |   0
 .../ExceptionMapperForRestfulObjectsApplication.java        |   0
 .../viewer/mappers/ExceptionMapperForRuntimeException.java  |   0
 .../viewer/restfulobjects/viewer/mappers/FailureUtil.java   |   0
 .../viewer/mappers/entity/ExceptionDetail.java              |   0
 .../restfulobjects/viewer/mappers/entity/ExceptionPojo.java |   0
 .../viewer/resources/DomainObjectResourceServerside.java    |   0
 .../viewer/resources/DomainResourceHelper.java              |   0
 .../viewer/resources/DomainServiceResourceServerside.java   |   0
 .../viewer/resources/DomainServicesListReprRenderer.java    |   0
 .../viewer/resources/DomainTypeResourceServerside.java      |   0
 .../viewer/resources/HomePageReprRenderer.java              |   0
 .../viewer/resources/HomePageResourceServerside.java        |   0
 .../viewer/resources/ImageResourceServerside.java           |   0
 .../restfulobjects/viewer/resources/JsonParserHelper.java   |   0
 .../viewer/resources/MenuBarsResourceServerside.java        |   0
 .../viewer/resources/ObjectActionArgHelper.java             |   0
 .../viewer/resources/ObjectAdapterAccessHelper.java         |   0
 .../viewer/resources/ObjectAdapterUpdateHelper.java         |   0
 .../restfulobjects/viewer/resources/ResourceAbstract.java   |   0
 .../viewer/resources/SwaggerSpecResource.java               |   0
 .../restfulobjects/viewer/resources/UserReprRenderer.java   |   0
 .../viewer/resources/UserResourceServerside.java            |   0
 .../viewer/resources/VersionReprRenderer.java               |   0
 .../viewer/resources/VersionResourceServerside.java         |   0
 .../resources/serialization/SerializationStrategy.java      |   0
 .../viewer/restfulobjects/viewer/util/UrlParserUtils.java   |   0
 .../viewer/webmodule/IsisRestfulObjectsSessionFilter.java   |   0
 .../webmodule/IsisTransactionFilterForRestfulObjects.java   |   0
 .../webmodule/auth/AuthenticationSessionStrategy.java       |   0
 .../auth/AuthenticationSessionStrategyAbstract.java         |   0
 .../auth/AuthenticationSessionStrategyBasicAuth.java        |   0
 .../auth/AuthenticationSessionStrategyDefault.java          |   0
 .../src/main/resources/static/swagger-ui/00-README.md       |   0
 .../src/main/resources/static/swagger-ui/favicon-16x16.png  | Bin
 .../src/main/resources/static/swagger-ui/favicon-32x32.png  | Bin
 .../main/resources/static/swagger-ui/index-ORIG-3.24.3.html |   0
 .../main/resources/static/swagger-ui/oauth2-redirect.html   |   0
 .../main/resources/static/swagger-ui/swagger-ui-bundle.js   |   0
 .../resources/static/swagger-ui/swagger-ui-bundle.js.map    |   0
 .../static/swagger-ui/swagger-ui-standalone-preset.js       |   0
 .../static/swagger-ui/swagger-ui-standalone-preset.js.map   |   0
 .../src/main/resources/static/swagger-ui/swagger-ui.css     |   0
 .../src/main/resources/static/swagger-ui/swagger-ui.css.map |   0
 .../src/main/resources/static/swagger-ui/swagger-ui.js      |   0
 .../src/main/resources/static/swagger-ui/swagger-ui.js.map  |   0
 .../viewer/src/main/resources/swagger-ui/index.thtml        |   0
 ...ceContext_ensureCompatibleAcceptHeader_ContractTest.java |   0
 .../viewer/context/ResourceContext_getArg_Test.java         |   0
 .../viewer/context/ResourceContext_stripQuotes_Test.java    |   0
 ...tfulObjectsApplicationExceptionMapper_Test_Contract.java |   0
 .../resources/DomainResourceHelper_readBodyAsMap_Test.java  |   0
 .../viewer/resources/JsonParserHelper_Test.java             |   0
 .../restfulobjects/viewer/util/UrlParserUtils_Test.java     |   0
 ...IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java |   0
 {core/viewers => viewers}/wicket/model/pom.xml              |   0
 .../isis/viewer/wicket/model/IsisModuleWicketModel.java     |   0
 .../isis/viewer/wicket/model/common/CommonContextUtils.java |   0
 .../isis/viewer/wicket/model/common/OnSelectionHandler.java |   0
 .../viewer/wicket/model/common/PageParametersUtils.java     |   0
 .../viewer/wicket/model/hints/HasUiHintDisambiguator.java   |   0
 .../viewer/wicket/model/hints/IsisActionCompletedEvent.java |   0
 .../isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java   |   0
 .../isis/viewer/wicket/model/hints/IsisEventAbstract.java   |   0
 .../viewer/wicket/model/hints/IsisEventLetterAbstract.java  |   0
 .../wicket/model/hints/IsisPropertyEditCompletedEvent.java  |   0
 .../isis/viewer/wicket/model/hints/IsisSelectorEvent.java   |   0
 .../isis/viewer/wicket/model/hints/UiHintContainer.java     |   0
 .../isis/viewer/wicket/model/isis/WicketViewerSettings.java |   0
 .../wicket/model/isis/WicketViewerSettingsAccessor.java     |   0
 .../apache/isis/viewer/wicket/model/links/LinkAndLabel.java |   0
 .../isis/viewer/wicket/model/links/LinksProvider.java       |   0
 .../isis/viewer/wicket/model/links/ListOfLinksModel.java    |   0
 .../isis/viewer/wicket/model/mementos/ActionMemento.java    |   0
 .../wicket/model/mementos/ActionParameterMemento.java       |   0
 .../viewer/wicket/model/mementos/CollectionMemento.java     |   0
 .../wicket/model/mementos/ObjectAdapterMemento_Legacy.java  |   0
 .../viewer/wicket/model/mementos/PageParameterNames.java    |   0
 .../isis/viewer/wicket/model/mementos/PropertyMemento.java  |   0
 .../apache/isis/viewer/wicket/model/models/AboutModel.java  |   0
 .../viewer/wicket/model/models/ActionArgumentModel.java     |   0
 .../apache/isis/viewer/wicket/model/models/ActionModel.java |   0
 .../isis/viewer/wicket/model/models/ActionPrompt.java       |   0
 .../viewer/wicket/model/models/ActionPromptProvider.java    |   0
 .../wicket/model/models/ActionPromptWithExtraContent.java   |   0
 .../isis/viewer/wicket/model/models/BookmarkTreeNode.java   |   0
 .../wicket/model/models/BookmarkTreeNodeComparator.java     |   0
 .../isis/viewer/wicket/model/models/BookmarkableModel.java  |   0
 .../viewer/wicket/model/models/BookmarkedPagesModel.java    |   0
 .../viewer/wicket/model/models/EntityCollectionModel.java   |   0
 .../apache/isis/viewer/wicket/model/models/EntityModel.java |   0
 .../viewer/wicket/model/models/EntityModelForReference.java |   0
 .../isis/viewer/wicket/model/models/FormExecutor.java       |   0
 .../viewer/wicket/model/models/FormExecutorContext.java     |   0
 .../wicket/model/models/HintPageParameterSerializer.java    |   0
 .../isis/viewer/wicket/model/models/ImageResourceCache.java |   0
 .../viewer/wicket/model/models/InlinePromptContext.java     |   0
 .../isis/viewer/wicket/model/models/ModelAbstract.java      |   0
 .../isis/viewer/wicket/model/models/ObjectAdapterModel.java |   0
 .../apache/isis/viewer/wicket/model/models/PageType.java    |   0
 .../wicket/model/models/ParentEntityModelProvider.java      |   0
 .../apache/isis/viewer/wicket/model/models/ScalarModel.java |   0
 .../wicket/model/models/ScalarModelWithMultiPending.java    |   0
 .../viewer/wicket/model/models/ScalarModelWithPending.java  |   0
 .../viewer/wicket/model/models/ServiceActionsModel.java     |   0
 .../viewer/wicket/model/models/ToggledMementosProvider.java |   0
 .../org/apache/isis/viewer/wicket/model/models/Util.java    |   0
 .../apache/isis/viewer/wicket/model/models/ValueModel.java  |   0
 .../apache/isis/viewer/wicket/model/models/VoidModel.java   |   0
 .../isis/viewer/wicket/model/models/WelcomeModel.java       |   0
 .../viewer/wicket/model/models/WicketComponentUtils.java    |   0
 .../viewer/wicket/model/models/whereami/WhereAmIModel.java  |   0
 .../wicket/model/models/whereami/WhereAmIModelDefault.java  |   0
 .../isis/viewer/wicket/model/util/ComponentHintKey.java     |   0
 .../isis/viewer/wicket/model/models/ActionModelTest.java    |   0
 .../viewer/wicket/model/models/EntityModel_hintsTest.java   |   0
 .../model/models/LowestCommonSuperclassClosureTest.java     |   0
 .../models/ScalarModel_isScalarSubtypingAnyOf_Test.java     |   0
 {core/viewers => viewers}/wicket/pom.xml                    |   2 +-
 {core/viewers => viewers}/wicket/src/main/doc/antora.yml    |   0
 .../main/doc/modules/ROOT/images/about-page/about-page.png  | Bin
 .../doc/modules/ROOT/images/application-menu/dividers.png   | Bin
 .../modules/ROOT/images/application-menu/layout-menus.pdn   | Bin
 .../modules/ROOT/images/application-menu/layout-menus.png   | Bin
 .../doc/modules/ROOT/images/application-menu/tertiary.png   | Bin
 .../images/blob-attachments/010-attachment-field-940.png    | Bin
 .../ROOT/images/blob-attachments/010-attachment-field.png   | Bin
 .../images/blob-attachments/020-edit-choose-file-940.png    | Bin
 .../ROOT/images/blob-attachments/020-edit-choose-file.png   | Bin
 .../blob-attachments/030-choose-file-using-browser-520.png  | Bin
 .../blob-attachments/030-choose-file-using-browser.png      | Bin
 .../blob-attachments/040-edit-chosen-file-indicated-940.png | Bin
 .../blob-attachments/040-edit-chosen-file-indicated.png     | Bin
 .../blob-attachments/050-ok-if-image-then-rendered-940.png  | Bin
 .../blob-attachments/050-ok-if-image-then-rendered.png      | Bin
 .../ROOT/images/blob-attachments/060-download-940.png       | Bin
 .../modules/ROOT/images/blob-attachments/060-download.png   | Bin
 .../ROOT/images/blob-attachments/070-edit-clear-940.png     | Bin
 .../modules/ROOT/images/blob-attachments/070-edit-clear.png | Bin
 .../doc/modules/ROOT/images/bookmarked-pages/panel-940.png  | Bin
 .../ROOT/images/bookmarked-pages/panel-estatio-940.png      | Bin
 .../modules/ROOT/images/bookmarked-pages/panel-estatio.png  | Bin
 .../main/doc/modules/ROOT/images/bookmarked-pages/panel.png | Bin
 .../modules/ROOT/images/brand-logo/brand-logo-signin.png    | Bin
 .../main/doc/modules/ROOT/images/brand-logo/brand-logo.png  | Bin
 .../ROOT/images/copy-link/010-copy-link-button-940.png      | Bin
 .../modules/ROOT/images/copy-link/010-copy-link-button.png  | Bin
 .../ROOT/images/copy-link/020-copy-link-dialog-940.png      | Bin
 .../modules/ROOT/images/copy-link/020-copy-link-dialog.png  | Bin
 .../doc/modules/ROOT/images/copy-link/030-hints-940.png     | Bin
 .../main/doc/modules/ROOT/images/copy-link/030-hints.png    | Bin
 .../ROOT/images/copy-link/040-copy-link-with-hints-940.png  | Bin
 .../ROOT/images/copy-link/040-copy-link-with-hints.png      | Bin
 .../doc/modules/ROOT/images/copy-link/050-title-url-940.png | Bin
 .../doc/modules/ROOT/images/copy-link/050-title-url.png     | Bin
 .../src/main/doc/modules/ROOT/images/dialog-mode/modal.png  | Bin
 .../main/doc/modules/ROOT/images/dialog-mode/sidebar.png    | Bin
 .../doc/modules/ROOT/images/embedded-view/no-footer.png     | Bin
 .../ROOT/images/embedded-view/no-header-no-footer.png       | Bin
 .../doc/modules/ROOT/images/embedded-view/no-header.png     | Bin
 .../main/doc/modules/ROOT/images/embedded-view/regular.png  | Bin
 .../ROOT/images/features/recent-pages/recent-pages.png      | Bin
 .../ui-hints/object-titles-and-icons/cust-order-product.png | Bin
 .../ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png     | Bin
 .../doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png | Bin
 .../main/doc/modules/ROOT/images/layouts/customer-order.png | Bin
 .../doc/modules/ROOT/images/layouts/estatio-Invoice.png     | Bin
 .../main/doc/modules/ROOT/images/layouts/estatio-Lease.png  | Bin
 .../doc/modules/ROOT/images/layouts/estatio-LeaseItem.png   | Bin
 .../doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png    | Bin
 .../main/doc/modules/ROOT/images/menubars/010-download.png  | Bin
 .../main/doc/modules/ROOT/images/menubars/020-download.png  | Bin
 .../doc/modules/ROOT/images/reference-layout/4-0-8-0.png    | Bin
 .../doc/modules/ROOT/images/reference-layout/4-4-4-12.png   | Bin
 .../doc/modules/ROOT/images/reference-layout/6-6-0-12.png   | Bin
 .../images/reference-layout/isis-layout-show-facets.css     |   0
 .../modules/ROOT/images/reference-layout/isis-layout.css    |   0
 .../ROOT/images/reference-layout/layout-4-0-8-0.html        |   0
 .../ROOT/images/reference-layout/layout-4-4-4-12.html       |   0
 .../ROOT/images/reference-layout/layout-6-6-0-12.html       |   0
 .../images/suppress-password-reset}/login-page-default.png  | Bin
 .../login-page-suppress-password-reset.png                  | Bin
 .../images/suppress-remember-me}/login-page-default.png     | Bin
 .../login-page-suppress-remember-me.png                     | Bin
 .../ROOT/images/suppress-sign-up}/login-page-default.png    | Bin
 .../images/suppress-sign-up/login-page-suppress-sign-up.png | Bin
 .../doc/modules/ROOT/images/theme-chooser/example-1.png     | Bin
 .../doc/modules/ROOT/images/theme-chooser/example-2.png     | Bin
 .../ROOT/images/user-registration}/login-page-default.png   | Bin
 .../images/user-registration/sign-up-after-registration.png | Bin
 .../sign-up-email-with-verification-link.png                | Bin
 .../user-registration/sign-up-login-page-after-sign-up.png  | Bin
 .../modules/ROOT/images/user-registration/sign-up-page.png  | Bin
 .../images/user-registration/sign-up-registration-page.png  | Bin
 .../doc/modules/ROOT/images/where-am-i/hello_grey_bg.png    | Bin
 .../wicket/src/main/doc/modules/ROOT/nav.adoc               |   0
 .../wicket/src/main/doc/modules/ROOT/pages/about.adoc       |   0
 .../doc/modules/ROOT/pages/configuration-properties.adoc    |   0
 .../src/main/doc/modules/ROOT/pages/customisation.adoc      |   0
 .../doc/modules/ROOT/pages/customisation/about-page.adoc    |   0
 .../doc/modules/ROOT/pages/customisation/auto-refresh.adoc  |   0
 .../doc/modules/ROOT/pages/customisation/brand-logo.adoc    |   0
 .../ROOT/pages/customisation/cheap-n-cheerful-theme.adoc    |   0
 .../modules/ROOT/pages/customisation/custom-javascript.adoc |   0
 .../ROOT/pages/customisation/request-parameters.adoc        |   0
 .../ROOT/pages/customisation/top-level-index-page.adoc      |   0
 .../ROOT/pages/customisation/tweaking-css-classes.adoc      |   0
 .../ROOT/pages/customisation/using-different-css-file.adoc  |   0
 .../doc/modules/ROOT/pages/customisation/welcome-page.adoc  |   0
 .../wicket/src/main/doc/modules/ROOT/pages/extending.adoc   |   0
 .../ROOT/pages/extending/custom-bootstrap-theme.adoc        |   0
 .../main/doc/modules/ROOT/pages/extending/custom-pages.adoc |   0
 .../pages/extending/login-via-query-args-prototyping.adoc   |   0
 .../ROOT/pages/extending/replacing-page-elements.adoc       |   0
 .../wicket/src/main/doc/modules/ROOT/pages/features.adoc    |   0
 .../doc/modules/ROOT/pages/features/blob-attachments.adoc   |   0
 .../doc/modules/ROOT/pages/features/bookmarked-pages.adoc   |   0
 .../doc/modules/ROOT/pages/features/hints-and-copy-url.adoc |   0
 .../main/doc/modules/ROOT/pages/features/recent-pages.adoc  |   0
 .../ROOT/pages/features/sidebar-vs-modal-dialogs.adoc       |   0
 .../doc/modules/ROOT/pages/features/titles-in-tables.adoc   |   0
 .../doc/modules/ROOT/pages/features/user-registration.adoc  |   0
 .../main/doc/modules/ROOT/pages/features/where-am-i.adoc    |   0
 .../src/main/doc/modules/ROOT/pages/hints-and-tips.adoc     |   0
 .../ROOT/pages/hints-and-tips/highlight-current-row.adoc    |   0
 .../pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc   |   0
 .../modules/ROOT/pages/hints-and-tips/per-user-themes.adoc  |   0
 .../doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc  |   0
 .../src/main/doc/modules/ROOT/pages/incode-platform.adoc    |   0
 .../wicket/src/main/doc/modules/ROOT/pages/layout.adoc      |   0
 .../doc/modules/ROOT/pages/layout/annotation-based.adoc     |   0
 .../src/main/doc/modules/ROOT/pages/layout/file-based.adoc  |   0
 .../main/doc/modules/ROOT/pages/layout/table-columns.adoc   |   0
 .../src/main/doc/modules/ROOT/pages/menubars-layout.adoc    |   0
 .../ROOT/pages/menubars-layout/annotation-based.adoc        |   0
 .../doc/modules/ROOT/pages/menubars-layout/file-based.adoc  |   0
 .../wicket/src/main/doc/modules/ROOT/pages/security.adoc    |   0
 .../src/main/doc/modules/ROOT/partials/component-nav.adoc   |   0
 .../src/main/doc/modules/ROOT/partials/module-nav.adoc      |   0
 .../src/main/doc/modules/ROOT/partials/security/pages.adoc  |   0
 .../modules/ROOT/partials/security/user-registration.adoc   |   0
 {core/viewers => viewers}/wicket/ui/pom.xml                 |   0
 .../wicket/ui/src/main/java/images/Images.java              |   0
 .../isis/viewer/wicket/ui/CollectionContentsAsFactory.java  |   0
 .../org/apache/isis/viewer/wicket/ui/ComponentFactory.java  |   0
 .../isis/viewer/wicket/ui/ComponentFactoryAbstract.java     |   0
 .../org/apache/isis/viewer/wicket/ui/ComponentType.java     |   0
 .../isis/viewer/wicket/ui/HeaderContributorProvider.java    |   0
 .../apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java    |   0
 .../wicket/ui/actionresponse/ActionResultResponse.java      |   0
 .../ActionResultResponseHandlingStrategy.java               |   0
 .../wicket/ui/actionresponse/ActionResultResponseType.java  |   0
 .../wicket/ui/app/registry/ComponentFactoryRegistrar.java   |   0
 .../wicket/ui/app/registry/ComponentFactoryRegistry.java    |   0
 .../ui/app/registry/ComponentFactoryRegistryAccessor.java   |   0
 .../isis/viewer/wicket/ui/components/about/AboutPanel.html  |   0
 .../isis/viewer/wicket/ui/components/about/AboutPanel.java  |   0
 .../wicket/ui/components/about/AboutPanelFactory.java       |   0
 .../wicket/ui/components/about/JarManifestAttributes.java   |   0
 .../wicket/ui/components/about/JarManifestListView.java     |   0
 .../viewer/wicket/ui/components/about/JarManifestModel.java |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.css  |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.html |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.java |   0
 .../isis/viewer/wicket/ui/components/about/div-toggle.js    |   0
 .../wicket/ui/components/actioninfo/ActionInfoPanel.html    |   0
 .../wicket/ui/components/actioninfo/ActionInfoPanel.java    |   0
 .../ui/components/actioninfo/ActionInfoPanelFactory.java    |   0
 .../wicket/ui/components/actionlink/ActionLinkPanel.html    |   0
 .../wicket/ui/components/actionlink/ActionLinkPanel.java    |   0
 .../ui/components/actionlink/ActionLinkPanelFactory.java    |   0
 .../wicket/ui/components/actionmenu/CssClassFaBehavior.java |   0
 .../entityactions/AdditionalLinksAsDropDownPanel.html       |   0
 .../entityactions/AdditionalLinksAsDropDownPanel.java       |   0
 .../entityactions/AdditionalLinksAsListInlinePanel.html     |   0
 .../entityactions/AdditionalLinksAsListInlinePanel.java     |   0
 .../actionmenu/entityactions/AdditionalLinksPanel.java      |   0
 .../actionmenu/entityactions/EntityActionLinkFactory.java   |   0
 .../actionmenu/entityactions/LinkAndLabelUtil.java          |   0
 .../components/actionmenu/serviceactions/CssMenuItem.java   |   0
 .../actionmenu/serviceactions/CssMenuItemPanelAbstract.java |   0
 .../actionmenu/serviceactions/CssSubMenuItemsPanel.html     |   0
 .../actionmenu/serviceactions/CssSubMenuItemsPanel.java     |   0
 .../actionmenu/serviceactions/ServiceActionLinkFactory.java |   0
 .../actionmenu/serviceactions/ServiceActionUtil.java        |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.css       |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.html      |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.java      |   0
 .../serviceactions/ServiceActionsPanelFactory.java          |   0
 .../actionmenu/serviceactions/ServiceAndAction.java         |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.css      |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.html     |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.java     |   0
 .../actionmenu/serviceactions/TertiaryMenuPanelFactory.java |   0
 .../ui/components/actionprompt/ActionPromptHeaderPanel.html |   0
 .../ui/components/actionprompt/ActionPromptHeaderPanel.java |   0
 .../ui/components/actionprompt/ActionPromptModalWindow.html |   0
 .../ui/components/actionprompt/ActionPromptModalWindow.java |   0
 .../ui/components/actionpromptsb/ActionPromptSidebar.html   |   0
 .../ui/components/actionpromptsb/ActionPromptSidebar.java   |   0
 .../ui/components/actions/ActionFormExecutorStrategy.java   |   0
 .../wicket/ui/components/actions/ActionParametersForm.java  |   0
 .../ui/components/actions/ActionParametersFormPanel.html    |   0
 .../ui/components/actions/ActionParametersFormPanel.java    |   0
 .../components/actions/ActionParametersFormPanel.properties |   0
 .../actions/ActionParametersFormPanelFactory.java           |   0
 .../wicket/ui/components/actions/ActionParametersPanel.html |   0
 .../wicket/ui/components/actions/ActionParametersPanel.java |   0
 .../ui/components/actions/ActionParametersPanelFactory.java |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.css  |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.html |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.java |   0
 .../bookmarkedpages/BookmarkedPagesPanelFactory.java        |   0
 .../components/bookmarkedpages/images/clear_bookmarks.png   | Bin
 .../wicket/ui/components/bookmarkedpages/slide-panel.js     |   0
 .../components/collection/AssociatedWithActionsHelper.java  |   0
 .../wicket/ui/components/collection/CollectionPanel.html    |   0
 .../wicket/ui/components/collection/CollectionPanel.java    |   0
 .../ui/components/collection/bulk/BulkActionsProvider.java  |   0
 .../collection/count/CollectionCountProvider.java           |   0
 .../collection/selector/CollectionSelectorHelper.java       |   0
 .../collection/selector/CollectionSelectorPanel.html        |   0
 .../collection/selector/CollectionSelectorPanel.java        |   0
 .../collection/selector/CollectionSelectorProvider.java     |   0
 .../ajaxtable/CollectionContentsAsAjaxTablePanel.html       |   0
 .../ajaxtable/CollectionContentsAsAjaxTablePanel.java       |   0
 .../CollectionContentsAsAjaxTablePanelFactory.java          |   0
 .../ajaxtable/CollectionContentsSortableDataProvider.java   |   0
 .../ajaxtable/IsisAjaxFallbackDataTable.java                |   0
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java           |   0
 .../ajaxtable/IsisAjaxFallbackOrderByBorder.java            |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.html                   |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.java                   |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.html                |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.java                |   0
 .../ajaxtable/IsisAjaxPagingNavigation.java                 |   0
 .../ajaxtable/IsisAjaxPagingNavigationIncrementLink.java    |   0
 .../ajaxtable/IsisAjaxPagingNavigationLink.java             |   0
 .../ajaxtable/IsisAjaxPagingNavigator.java                  |   0
 .../ajaxtable/IsisTotalRecordsToolbar.html                  |   0
 .../ajaxtable/IsisTotalRecordsToolbar.java                  |   0
 .../ajaxtable/PrototypingMessageProvider.java               |   0
 .../ajaxtable/columns/ColumnAbstract.java                   |   0
 .../ajaxtable/columns/ObjectAdapterPropertyColumn.java      |   0
 .../ajaxtable/columns/ObjectAdapterTitleColumn.java         |   0
 .../ajaxtable/columns/ObjectAdapterToggleboxColumn.java     |   0
 .../collectioncontents/ajaxtable/images/arrow_down.png      | Bin
 .../collectioncontents/ajaxtable/images/arrow_off.png       | Bin
 .../collectioncontents/ajaxtable/images/arrow_up.png        | Bin
 .../icons/CollectionContentsAsIconsPanel.html               |   0
 .../icons/CollectionContentsAsIconsPanel.java               |   0
 .../icons/CollectionContentsAsIconsPanelFactory.java        |   0
 .../multiple/CollectionContentsMultipleViewsPanel.html      |   0
 .../multiple/CollectionContentsMultipleViewsPanel.java      |   0
 .../CollectionContentsMultipleViewsPanelFactory.java        |   0
 .../summary/CollectionContentsAsSummary.html                |   0
 .../summary/CollectionContentsAsSummary.java                |   0
 .../summary/CollectionContentsAsSummaryFactory.java         |   0
 .../unresolved/CollectionContentsHiddenPanel.html           |   0
 .../unresolved/CollectionContentsHiddenPanel.java           |   0
 .../unresolved/CollectionContentsHiddenPanelFactory.java    |   0
 .../wicket/ui/components/empty/EmptyCollectionPanel.html    |   0
 .../wicket/ui/components/empty/EmptyCollectionPanel.java    |   0
 .../ui/components/empty/EmptyCollectionPanelFactory.java    |   0
 .../components/entity/EntityComponentFactoryAbstract.java   |   0
 .../components/entity/collection/EntityCollectionPanel.html |   0
 .../components/entity/collection/EntityCollectionPanel.java |   0
 .../entity/collection/EntityCollectionPanelFactory.java     |   0
 .../wicket/ui/components/entity/fieldset/PropertyGroup.html |   0
 .../wicket/ui/components/entity/fieldset/PropertyGroup.java |   0
 .../ui/components/entity/header/EntityHeaderPanel.html      |   0
 .../ui/components/entity/header/EntityHeaderPanel.java      |   0
 .../components/entity/header/EntityHeaderPanelFactory.java  |   0
 .../entity/icontitle/EntityIconAndTitlePanel.html           |   0
 .../entity/icontitle/EntityIconAndTitlePanel.java           |   0
 .../entity/icontitle/EntityIconAndTitlePanelFactory.java    |   0
 .../entity/icontitle/EntityIconTitleAndCopyLinkPanel.html   |   0
 .../entity/icontitle/EntityIconTitleAndCopyLinkPanel.java   |   0
 .../icontitle/EntityIconTitleAndCopyLinkPanelFactory.java   |   0
 .../entity/selector/links/EntityLinksSelectorPanel.html     |   0
 .../entity/selector/links/EntityLinksSelectorPanel.java     |   0
 .../selector/links/EntityLinksSelectorPanelFactory.java     |   0
 .../viewer/wicket/ui/components/footer/CreditImage.java     |   0
 .../isis/viewer/wicket/ui/components/footer/CreditName.java |   0
 .../viewer/wicket/ui/components/footer/FooterPanel.html     |   0
 .../viewer/wicket/ui/components/footer/FooterPanel.java     |   0
 .../wicket/ui/components/footer/FooterPanelFactory.java     |   0
 .../viewer/wicket/ui/components/header/HeaderPanel.html     |   0
 .../viewer/wicket/ui/components/header/HeaderPanel.java     |   0
 .../wicket/ui/components/header/HeaderPanelFactory.java     |   0
 .../wicket/ui/components/layout/bs3/BS3GridPanel.html       |   0
 .../wicket/ui/components/layout/bs3/BS3GridPanel.java       |   0
 .../isis/viewer/wicket/ui/components/layout/bs3/Util.java   |   0
 .../wicket/ui/components/layout/bs3/clearfix/ClearFix.html  |   0
 .../wicket/ui/components/layout/bs3/clearfix/ClearFix.java  |   0
 .../viewer/wicket/ui/components/layout/bs3/col/Col.html     |   0
 .../viewer/wicket/ui/components/layout/bs3/col/Col.java     |   0
 .../bs3/col/RepeatingViewWithDynamicallyVisibleContent.java |   0
 .../viewer/wicket/ui/components/layout/bs3/row/Row.html     |   0
 .../viewer/wicket/ui/components/layout/bs3/row/Row.java     |   0
 .../wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java |   0
 .../wicket/ui/components/layout/bs3/tabs/TabPanel.html      |   0
 .../wicket/ui/components/layout/bs3/tabs/TabPanel.java      |   0
 .../wicket/ui/components/property/PropertyEditForm.java     |   0
 .../ui/components/property/PropertyEditFormPanel.html       |   0
 .../ui/components/property/PropertyEditFormPanel.java       |   0
 .../ui/components/property/PropertyEditFormPanel.properties |   0
 .../components/property/PropertyEditFormPanelFactory.java   |   0
 .../wicket/ui/components/property/PropertyEditPanel.html    |   0
 .../wicket/ui/components/property/PropertyEditPanel.java    |   0
 .../ui/components/property/PropertyEditPanelFactory.java    |   0
 .../components/property/PropertyFormExecutorStrategy.java   |   0
 .../propertyheader/PropertyEditPromptHeaderPanel.html       |   0
 .../propertyheader/PropertyEditPromptHeaderPanel.java       |   0
 .../components/scalars/ComponentFactoryScalarAbstract.java  |   0
 .../viewer/wicket/ui/components/scalars/DateConverter.java  |   0
 .../wicket/ui/components/scalars/DateConverterAbstract.java |   0
 .../wicket/ui/components/scalars/DateConverterPlugin.java   |   0
 .../wicket/ui/components/scalars/DateFormatSettings.java    |   0
 .../wicket/ui/components/scalars/IsisConverterLocator.java  |   0
 .../wicket/ui/components/scalars/ScalarModelSubscriber.java |   0
 .../ui/components/scalars/ScalarModelSubscriber2.java       |   0
 .../wicket/ui/components/scalars/ScalarPanelAbstract.java   |   0
 .../wicket/ui/components/scalars/ScalarPanelAbstract2.java  |   0
 .../ui/components/scalars/ScalarPanelSelect2Abstract.java   |   0
 .../ui/components/scalars/ScalarPanelTextFieldAbstract.html |   0
 .../ui/components/scalars/ScalarPanelTextFieldAbstract.java |   0
 .../scalars/ScalarPanelTextFieldDatePickerAbstract.java     |   0
 .../ui/components/scalars/ScalarPanelTextFieldNumeric.java  |   0
 .../scalars/ScalarPanelTextFieldParseableAbstract.java      |   0
 .../wicket/ui/components/scalars/TextFieldAbstract.java     |   0
 .../wicket/ui/components/scalars/TextFieldStringModel.java  |   0
 .../wicket/ui/components/scalars/TextFieldValueModel.java   |   0
 .../wicket/ui/components/scalars/XEditableBehavior2.java    |   0
 .../ui/components/scalars/datepicker/DateTimeConfig.java    |   0
 .../scalars/datepicker/TextFieldWithDateTimePicker.java     |   0
 .../scalars/datepicker/css/bootstrap-datetimepicker.css     |   0
 .../scalars/datepicker/css/bootstrap-datetimepicker.min.css |   0
 .../scalars/datepicker/js/bootstrap-datetimepicker.js       |   0
 .../scalars/datepicker/js/bootstrap-datetimepicker.min.js   |   0
 .../wicket/ui/components/scalars/datepicker/js/moment.js    |   0
 .../ui/components/scalars/datepicker/js/moment.min.js       |   0
 .../ui/components/scalars/image/JavaAwtImagePanel.html      |   0
 .../ui/components/scalars/image/JavaAwtImagePanel.java      |   0
 .../components/scalars/image/JavaAwtImagePanelFactory.java  |   0
 .../wicket/ui/components/scalars/image/wupb-progressBar.css |   0
 .../scalars/isisapplib/IsisBlobOrClobPanelAbstract.html     |   0
 .../scalars/isisapplib/IsisBlobOrClobPanelAbstract.java     |   0
 .../ui/components/scalars/isisapplib/IsisBlobPanel.java     |   0
 .../components/scalars/isisapplib/IsisBlobPanelFactory.java |   0
 .../ui/components/scalars/isisapplib/IsisClobPanel.java     |   0
 .../components/scalars/isisapplib/IsisClobPanelFactory.java |   0
 .../ui/components/scalars/isisapplib/IsisPasswordPanel.java |   0
 .../scalars/isisapplib/IsisPasswordPanelFactory.java        |   0
 .../ui/components/scalars/isisapplib/IsisTimePanel.java     |   0
 .../components/scalars/isisapplib/ResourceLinkVolatile.java |   0
 .../scalars/jdk8time/DateConverterForJdk8Abstract.java      |   0
 .../scalars/jdk8time/DateConverterForJdk8LocalDate.java     |   0
 .../scalars/jdk8time/DateConverterForJdk8LocalDateTime.java |   0
 .../jdk8time/DateConverterForJdk8OffsetDateTime.java        |   0
 .../ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java  |   0
 .../scalars/jdk8time/Jdk8LocalDatePanelFactory.java         |   0
 .../components/scalars/jdk8time/Jdk8LocalDateTimePanel.java |   0
 .../scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java     |   0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java           |   0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java    |   0
 .../scalars/jdkdates/DateConverterForJavaAbstract.java      |   0
 .../scalars/jdkdates/DateConverterForJavaSqlDate.java       |   0
 .../scalars/jdkdates/DateConverterForJavaSqlTimestamp.java  |   0
 .../scalars/jdkdates/DateConverterForJavaUtilDate.java      |   0
 .../ui/components/scalars/jdkdates/JavaSqlDatePanel.java    |   0
 .../scalars/jdkdates/JavaSqlDatePanelFactory.java           |   0
 .../ui/components/scalars/jdkdates/JavaSqlTimePanel.java    |   0
 .../scalars/jdkdates/JavaSqlTimePanelFactory.java           |   0
 .../components/scalars/jdkdates/JavaSqlTimestampPanel.java  |   0
 .../scalars/jdkdates/JavaSqlTimestampPanelFactory.java      |   0
 .../ui/components/scalars/jdkdates/JavaUtilDatePanel.java   |   0
 .../scalars/jdkdates/JavaUtilDatePanelFactory.java          |   0
 .../scalars/jdkmath/BigDecimalConverterWithScale.java       |   0
 .../ui/components/scalars/jdkmath/BigDecimalTextField.java  |   0
 .../components/scalars/jdkmath/JavaMathBigDecimalPanel.java |   0
 .../scalars/jdkmath/JavaMathBigDecimalPanelFactory.java     |   0
 .../components/scalars/jdkmath/JavaMathBigIntegerPanel.java |   0
 .../scalars/jdkmath/JavaMathBigIntegerPanelFactory.java     |   0
 .../scalars/jodatime/DateConverterForJodaAbstract.java      |   0
 .../scalars/jodatime/DateConverterForJodaDateTime.java      |   0
 .../scalars/jodatime/DateConverterForJodaLocalDate.java     |   0
 .../scalars/jodatime/DateConverterForJodaLocalDateTime.java |   0
 .../ui/components/scalars/jodatime/JodaDateTimePanel.java   |   0
 .../scalars/jodatime/JodaDateTimePanelFactory.java          |   0
 .../ui/components/scalars/jodatime/JodaLocalDatePanel.java  |   0
 .../scalars/jodatime/JodaLocalDatePanelFactory.java         |   0
 .../components/scalars/jodatime/JodaLocalDateTimePanel.java |   0
 .../scalars/jodatime/JodaLocalDateTimePanelFactory.java     |   0
 .../ui/components/scalars/markup/MarkupComponent.java       |   0
 .../components/scalars/markup/MarkupComponentFactory.java   |   0
 .../components/scalars/markup/MarkupComponent_reloadJs.java |   0
 .../wicket/ui/components/scalars/markup/MarkupPanel.java    |   0
 .../ui/components/scalars/markup/MarkupPanelFactories.java  |   0
 .../ui/components/scalars/markup/StandaloneMarkupPanel.html |   0
 .../ui/components/scalars/markup/StandaloneMarkupPanel.java |   0
 .../ui/components/scalars/primitive/BooleanPanel.html       |   0
 .../ui/components/scalars/primitive/BooleanPanel.java       |   0
 .../components/scalars/primitive/BooleanPanelFactory.java   |   0
 .../scalars/primitive/BooleanPanel_labelRightPosition.html  |   0
 .../wicket/ui/components/scalars/primitive/BytePanel.java   |   0
 .../ui/components/scalars/primitive/BytePanelFactory.java   |   0
 .../ui/components/scalars/primitive/CharacterPanel.java     |   0
 .../components/scalars/primitive/CharacterPanelFactory.java |   0
 .../wicket/ui/components/scalars/primitive/DoublePanel.java |   0
 .../ui/components/scalars/primitive/DoublePanelFactory.java |   0
 .../wicket/ui/components/scalars/primitive/FloatPanel.java  |   0
 .../ui/components/scalars/primitive/FloatPanelFactory.java  |   0
 .../ui/components/scalars/primitive/IntegerPanel.java       |   0
 .../components/scalars/primitive/IntegerPanelFactory.java   |   0
 .../wicket/ui/components/scalars/primitive/LongPanel.java   |   0
 .../ui/components/scalars/primitive/LongPanelFactory.java   |   0
 .../wicket/ui/components/scalars/primitive/ShortPanel.java  |   0
 .../ui/components/scalars/primitive/ShortPanelFactory.java  |   0
 .../scalars/reference/EntityLinkSelect2Panel.html           |   0
 .../scalars/reference/EntityLinkSelect2Panel.java           |   0
 .../ui/components/scalars/reference/ReferencePanel.html     |   0
 .../ui/components/scalars/reference/ReferencePanel.java     |   0
 .../components/scalars/reference/ReferencePanelFactory.java |   0
 .../ui/components/scalars/string/MultiLineStringPanel.java  |   0
 .../wicket/ui/components/scalars/string/StringPanel.java    |   0
 .../ui/components/scalars/string/StringPanelFactory.java    |   0
 .../wicket/ui/components/scalars/uuid/UuidConverter.java    |   0
 .../viewer/wicket/ui/components/scalars/uuid/UuidPanel.java |   0
 .../wicket/ui/components/scalars/uuid/UuidPanelFactory.java |   0
 .../wicket/ui/components/scalars/uuid/UuidTextField.java    |   0
 .../wicket/ui/components/scalars/value/ValuePanel.java      |   0
 .../ui/components/scalars/value/ValuePanelFactory.java      |   0
 .../scalars/valuechoices/ValueChoicesSelect2Panel.html      |   0
 .../scalars/valuechoices/ValueChoicesSelect2Panel.java      |   0
 .../valuechoices/ValueChoicesSelect2PanelFactory.java       |   0
 .../standalonecollection/StandaloneCollectionPanel.html     |   0
 .../standalonecollection/StandaloneCollectionPanel.java     |   0
 .../StandaloneCollectionPanelFactory.java                   |   0
 .../wicket/ui/components/tree/IsisToWicketTreeAdapter.java  |   0
 .../wicket/ui/components/tree/StandaloneTreePanel.html      |   0
 .../wicket/ui/components/tree/StandaloneTreePanel.java      |   0
 .../isis/viewer/wicket/ui/components/tree/TreePanel.html    |   0
 .../isis/viewer/wicket/ui/components/tree/TreePanel.java    |   0
 .../wicket/ui/components/tree/TreePanelFactories.java       |   0
 .../wicket/ui/components/tree/themes/TreeThemeProvider.java |   0
 .../ui/components/tree/themes/TreeThemeProviderDefault.java |   0
 .../tree/themes/bootstrap/IsisBootstrapTreeTheme.java       |   0
 .../wicket/ui/components/tree/themes/bootstrap/theme.css    |   0
 .../wicket/ui/components/unknown/UnknownModelPanel.html     |   0
 .../wicket/ui/components/unknown/UnknownModelPanel.java     |   0
 .../ui/components/unknown/UnknownModelPanelFactory.java     |   0
 .../wicket/ui/components/value/StandaloneValuePanel.html    |   0
 .../wicket/ui/components/value/StandaloneValuePanel.java    |   0
 .../ui/components/value/StandaloneValuePanelFactory.java    |   0
 .../wicket/ui/components/voidreturn/VoidReturnPanel.html    |   0
 .../wicket/ui/components/voidreturn/VoidReturnPanel.java    |   0
 .../ui/components/voidreturn/VoidReturnPanelFactory.java    |   0
 .../viewer/wicket/ui/components/welcome/WelcomePanel.html   |   0
 .../viewer/wicket/ui/components/welcome/WelcomePanel.java   |   0
 .../wicket/ui/components/welcome/WelcomePanelFactory.java   |   0
 .../wicket/ui/components/widgets/bootstrap/FormGroup.java   |   0
 .../wicket/ui/components/widgets/bootstrap/ModalDialog.java |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbModel.java  |   0
 .../widgets/breadcrumbs/BreadcrumbModelProvider.java        |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbPanel.html  |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbPanel.java  |   0
 .../ui/components/widgets/buttons/ContainedButtonPanel.html |   0
 .../ui/components/widgets/buttons/ContainedButtonPanel.java |   0
 .../ui/components/widgets/buttons/ToggleButtonsPanel.html   |   0
 .../ui/components/widgets/buttons/ToggleButtonsPanel.java   |   0
 .../widgets/checkbox/ContainedToggleboxPanel.html           |   0
 .../widgets/checkbox/ContainedToggleboxPanel.java           |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.css      |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.html     |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.java     |   0
 .../entitysimplelink/EntityLinkSimplePanelFactory.java      |   0
 .../wicket/ui/components/widgets/favicon/Favicon.java       |   0
 .../widgets/formcomponent/CancelHintRequired.java           |   0
 .../widgets/formcomponent/FormComponentPanelAbstract.java   |   0
 .../components/widgets/formcomponent/FormFeedbackPanel.java |   0
 .../ui/components/widgets/linkandlabel/ActionLink.java      |   0
 .../components/widgets/linkandlabel/ActionLinkFactory.java  |   0
 .../widgets/linkandlabel/ActionLinkFactoryAbstract.java     |   0
 .../widgets/linkandlabel/AjaxDeferredBehaviour.java         |   0
 .../wicket/ui/components/widgets/navbar/BrandLogo.java      |   0
 .../wicket/ui/components/widgets/navbar/BrandName.java      |   0
 .../wicket/ui/components/widgets/navbar/Placement.java      |   0
 .../wicket/ui/components/widgets/select2/ChoiceExt.java     |   0
 .../wicket/ui/components/widgets/select2/Select2.java       |   0
 .../widgets/select2/Select2BootstrapCssReference.java       |   0
 .../ui/components/widgets/select2/Select2ChoiceExt.java     |   0
 .../ui/components/widgets/select2/Select2JsReference.java   |   0
 .../components/widgets/select2/Select2MultiChoiceExt.java   |   0
 .../widgets/select2/providers/EmptyChoiceProvider.java      |   0
 .../providers/ObjectAdapterMementoProviderAbstract.java     |   0
 .../providers/ObjectAdapterMementoProviderForChoices.java   |   0
 .../ObjectAdapterMementoProviderForReferenceChoices.java    |   0
 ...dapterMementoProviderForReferenceObjectAutoComplete.java |   0
 ...entoProviderForReferenceParamOrPropertyAutoComplete.java |   0
 .../ObjectAdapterMementoProviderForValueChoices.java        |   0
 .../ui/components/widgets/select2/select2-bootstrap.css     |   0
 .../widgets/themepicker/IsisWicketThemeSupport.java         |   0
 .../widgets/themepicker/IsisWicketThemeSupportDefault.java  |   0
 .../ui/components/widgets/themepicker/ThemeChooser.html     |   0
 .../ui/components/widgets/themepicker/ThemeChooser.java     |   0
 .../widgets/themepicker/ThemeProviderComposite.java         |   0
 .../widgets/zclip/SimpleClipboardModalWindow.html           |   0
 .../widgets/zclip/SimpleClipboardModalWindow.java           |   0
 .../widgets/zclip/SimpleClipboardModalWindowForm.java       |   0
 .../widgets/zclip/SimpleClipboardModalWindowPanel.html      |   0
 .../widgets/zclip/SimpleClipboardModalWindowPanel.java      |   0
 .../ui/components/widgets/zclip/ZeroClipboardPanel.html     |   0
 .../ui/components/widgets/zclip/ZeroClipboardPanel.java     |   0
 .../apache/isis/viewer/wicket/ui/errors/ExceptionModel.java |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.css    |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.html   |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.java   |   0
 .../isis/viewer/wicket/ui/errors/JGrowlBehaviour.java       |   0
 .../org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java |   0
 .../isis/viewer/wicket/ui/errors/StackTraceDetail.java      |   0
 .../isis/viewer/wicket/ui/errors/StackTraceListView.java    |   0
 .../org/apache/isis/viewer/wicket/ui/errors/div-toggle.js   |   0
 .../isis/viewer/wicket/ui/errors/js/bootstrap-growl.js      |   0
 .../isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js  |   0
 .../wicket/ui/pages/BookmarkedPagesModelProvider.java       |   0
 .../ui/pages/BootstrapOverridesCssResourceReference.java    |   0
 .../viewer/wicket/ui/pages/EmailVerificationUrlService.java |   0
 .../apache/isis/viewer/wicket/ui/pages/PageAbstract.html    |   0
 .../apache/isis/viewer/wicket/ui/pages/PageAbstract.java    |   0
 .../isis/viewer/wicket/ui/pages/PageAbstract.properties     |   0
 .../apache/isis/viewer/wicket/ui/pages/PageClassList.java   |   0
 .../isis/viewer/wicket/ui/pages/PageClassRegistry.java      |   0
 .../viewer/wicket/ui/pages/PageClassRegistryAccessor.java   |   0
 .../isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java   |   0
 .../isis/viewer/wicket/ui/pages/PageNavigationService.java  |   0
 .../viewer/wicket/ui/pages/SidebarCssResourceReference.java |   0
 .../org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.java |   0
 .../wicket/ui/pages/accmngt/AccountConfirmationMap.java     |   0
 .../ui/pages/accmngt/AccountManagementPageAbstract.html     |   0
 .../ui/pages/accmngt/AccountManagementPageAbstract.java     |   0
 .../pages/accmngt/AccountManagementPageAbstract.properties  |   0
 .../wicket/ui/pages/accmngt/EmailAvailableValidator.java    |   0
 .../pages/accmngt/EmailVerificationUrlServiceDefault.java   |   0
 .../wicket/ui/pages/accmngt/UsernameAvailableValidator.java |   0
 .../accmngt/password_reset/PasswordResetEmailPanel.html     |   0
 .../accmngt/password_reset/PasswordResetEmailPanel.java     |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.css   |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.html  |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.java  |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPanel.html |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPanel.java |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.css       |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.html      |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.java      |   0
 .../wicket/ui/pages/accmngt/register/RegisterPanel.html     |   0
 .../wicket/ui/pages/accmngt/register/RegisterPanel.java     |   0
 .../wicket/ui/pages/accmngt/signup/RegistrationFormPage.css |   0
 .../ui/pages/accmngt/signup/RegistrationFormPage.html       |   0
 .../ui/pages/accmngt/signup/RegistrationFormPage.java       |   0
 .../ui/pages/accmngt/signup/RegistrationFormPanel.html      |   0
 .../ui/pages/accmngt/signup/RegistrationFormPanel.java      |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.css       |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.html      |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.java      |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css   |   0
 .../wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-darkly.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-flatly.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-journal.css  |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-lumen.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-paper.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-readable.css |   0
 .../wicket/ui/pages/bootstrap-overrides-sandstone.css       |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-simplex.css  |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-slate.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css |   0
 .../wicket/ui/pages/bootstrap-overrides-superhero.css       |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-united.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-yeti.css     |   0
 .../java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png | Bin
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.css       |   0
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.html      |   0
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.java      |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.css    |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.html   |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.java   |   0
 .../isis/viewer/wicket/ui/pages/images/bg_header_brown.png  | Bin
 .../isis/viewer/wicket/ui/pages/images/icon_appuser.png     | Bin
 .../org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn  | Bin
 .../org/apache/isis/viewer/wicket/ui/pages/images/logo.png  | Bin
 .../ui/pages/isis-wicket-theme/images/animated-overlay.gif  | Bin
 .../isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png                  | Bin
 .../images/ui-bg_glass_55_40c0cb_1x400.png                  | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png                  | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png                  | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png                  | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png                  | Bin
 .../images/ui-bg_highlight-soft_75_20B5C2_1x100.png         | Bin
 .../isis-wicket-theme/images/ui-icons_00477F_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_2e83ff_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_454545_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_888888_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png    | Bin
 .../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js     |   0
 .../apache/isis/viewer/wicket/ui/pages/jquery.livequery.js  |   0
 .../isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html  |   0
 .../isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java  |   0
 .../isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.css  |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.html |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.java |   0
 .../wicket/ui/pages/login/WicketSignInPage.properties       |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css   |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html  |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java  |   0
 .../apache/isis/viewer/wicket/ui/pages/simple-sidebar.css   |   0
 .../apache/isis/viewer/wicket/ui/pages/spinning-icon.gif    | Bin
 .../pages/standalonecollection/StandaloneCollectionPage.css |   0
 .../standalonecollection/StandaloneCollectionPage.html      |   0
 .../standalonecollection/StandaloneCollectionPage.java      |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.java |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css    |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html   |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java   |   0
 .../isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd  |   0
 .../apache/isis/viewer/wicket/ui/panels/FormAbstract.java   |   0
 .../isis/viewer/wicket/ui/panels/FormExecutorDefault.java   |   0
 .../isis/viewer/wicket/ui/panels/FormExecutorStrategy.java  |   0
 .../wicket/ui/panels/HasDynamicallyVisibleContent.java      |   0
 .../wicket/ui/panels/IFormSubmitterWithPreValidateHook.java |   0
 .../apache/isis/viewer/wicket/ui/panels/PanelAbstract.java  |   0
 .../org/apache/isis/viewer/wicket/ui/panels/PanelBase.java  |   0
 .../org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java  |   0
 .../isis/viewer/wicket/ui/panels/PromptFormAbstract.java    |   0
 .../viewer/wicket/ui/panels/PromptFormPanelAbstract.java    |   0
 .../org/apache/isis/viewer/wicket/ui/util/Components.java   |   0
 .../apache/isis/viewer/wicket/ui/util/CssClassAppender.java |   0
 .../apache/isis/viewer/wicket/ui/util/CssClassRemover.java  |   0
 .../apache/isis/viewer/wicket/ui/util/CssIdAppender.java    |   0
 .../java/org/apache/isis/viewer/wicket/ui/util/Links.java   |   0
 .../org/apache/isis/viewer/wicket/ui/util/SSESupport.java   |   0
 .../org/apache/isis/viewer/wicket/ui/util/SSESupport.js     |   0
 .../org/apache/isis/viewer/wicket/ui/util/Tooltips.java     |   0
 .../org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css |   0
 .../isis/viewer/wicket/ui/validation/ValidatorBase.java     |   0
 .../wicket/ui/src/main/resources/images/Default.png         | Bin
 .../viewer/wicket/ui/ComponentFactoryAbstractTest_init.java |   0
 .../isis/viewer/wicket/ui/ComponentType_ConstantsTest.java  |   0
 .../CollectionContentsSelectorDropdownPanelTest.java        |   0
 .../icontitle/EntityIconAndTitlePanelTest_abbreviated.java  |   0
 .../scalars/jdkdates/DateConverterForJavaSqlDateTest.java   |   0
 .../scalars/jdkdates/DateConverterForJavaUtilDateTest.java  |   0
 .../jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java |   0
 .../scalars/jodatime/DateConverterForJodaDateTimeTest.java  |   0
 .../scalars/jodatime/DateConverterForJodaLocalDateTest.java |   0
 .../jodatime/DateConverterForJodaLocalDateTimeTest.java     |   0
 .../jdk8time/DateConverterForJdk8LocalDateTest.java         |   0
 .../jdk8time/DateConverterForJdk8LocalDateTimeTest.java     |   0
 .../jdk8time/DateConverterForJdk8OffsetDateTimeTest.java    |   0
 .../scalars/uuid/UuidConverterTest_roundtrip.java           |   0
 .../ObjectAdapterMementoProviderForValueChoicesTest.java    |   0
 .../apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java |   0
 .../apache/isis/viewer/wicket/ui/fixtures/Customers.java    |   0
 .../isis/viewer/wicket/ui/pages/PageAbstractTest.java       |   0
 {core/viewers => viewers}/wicket/viewer/pom.xml             |   0
 .../isis/viewer/wicket/viewer/IsisModuleWicketViewer.java   |   0
 .../viewer/integration/AnonymousWebSessionForIsis.java      |   0
 .../viewer/integration/AuthenticatedWebSessionForIsis.java  |   0
 .../viewer/integration/ConverterForObjectAdapter.java       |   0
 .../integration/ConverterForObjectAdapterMemento.java       |   0
 .../wicket/viewer/integration/IsisResourceSettings.java     |   0
 .../viewer/wicket/viewer/integration/LocalizerForIsis.java  |   0
 .../wicket/viewer/integration/WebRequestCycleForIsis.java   |   0
 .../isis/viewer/wicket/viewer/mixins/Object_clearHints.java |   0
 .../components/ComponentFactoryRegistrarDefault.java        |   0
 .../components/ComponentFactoryRegistryDefault.java         |   0
 .../viewer/registries/pages/PageClassListDefault.java       |   0
 .../viewer/registries/pages/PageClassRegistryDefault.java   |   0
 .../registries/pages/PageNavigationServiceDefault.java      |   0
 .../wicket/viewer/services/BookmarkUiServiceWicket.java     |   0
 .../wicket/viewer/services/DeepLinkServiceWicket.java       |   0
 .../wicket/viewer/services/HintStoreUsingWicketSession.java |   0
 .../wicket/viewer/services/ImageResourceCacheClassPath.java |   0
 .../viewer/wicket/viewer/services/LocaleProviderWicket.java |   0
 .../wicket/viewer/services/TranslationsResolverWicket.java  |   0
 .../wicket/viewer/services/WicketViewerSettingsDefault.java |   0
 .../wicket/viewer/services/mementos/CollectionData.java     |   0
 .../isis/viewer/wicket/viewer/services/mementos/Data.java   |   0
 .../viewer/wicket/viewer/services/mementos/ObjectData.java  |   0
 .../wicket/viewer/services/mementos/ObjectMarshaller.java   |   0
 .../viewer/services/mementos/ObjectMementoLegacy.java       |   0
 .../services/mementos/ObjectMementoServiceWicket.java       |   0
 .../wicket/viewer/services/mementos/ObjectUnmarshaller.java |   0
 .../wicket/viewer/services/mementos/StandaloneData.java     |   0
 .../viewer/wicket/viewer/webmodule/WebModuleWicket.java     |   0
 .../wicket/viewer/wicketapp/IsisWicketApplication.java      |   0
 .../wicketapp/IsisWicketApplication_Experimental.java       |   0
 .../wicketapp/IsisWicketApplication_newPageFactory.java     |   0
 .../viewer/wicketapp/IsisWicketApplication_newSession.java  |   0
 .../TargetRespondListenerToResetQueryResultCache.java       |   0
 .../wicket/viewer/src/main/resources/log4j.properties       |   0
 .../AuthenticatedWebSessionForIsis_Authenticate.java        |   0
 ...edWebSessionForIsis_DownCastsInheritedFunctionality.java |   0
 .../AuthenticatedWebSessionForIsis_Instantiation.java       |   0
 .../AuthenticatedWebSessionForIsis_NotYetImplemented.java   |   0
 .../integration/AuthenticatedWebSessionForIsis_SignIn.java  |   0
 .../AuthenticatedWebSessionForIsis_TestAbstract.java        |   0
 .../pages/PageClassListDefault_Instantiation.java           |   0
 .../pages/PageClassListDefault_RegistrationAndCaching.java  |   0
 .../wicket/viewer/services/ImageResourceCacheKeyTest.java   |   0
 .../viewer/services/TranslationsResolverWicketTest.java     |   0
 .../viewer/wicketapp/IsisWicketApplication_Defaults.java    |   0
 .../viewer/wicketapp/IsisWicketApplication_Pages.java       |   0
 1076 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 3b469a7..77b57ed 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1856,8 +1856,8 @@
 		<module>../security/shiro</module>
 		<module>../security/keycloak</module>
 
-		<module>viewers/restfulobjects</module>
-		<module>viewers/wicket</module>
+		<module>../viewers/restfulobjects</module>
+		<module>../viewers/wicket</module>
 
 		<module>../persistence/jdo</module>
 
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/viewers/restfulobjects/applib/pom.xml
similarity index 100%
rename from core/viewers/restfulobjects/applib/pom.xml
rename to viewers/restfulobjects/applib/pom.xml
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulRequest.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulRequest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulRequest.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulRequest.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
diff --git a/core/viewers/restfulobjects/applib/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.applib.client.UriBuilderPlugin b/viewers/restfulobjects/applib/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.applib.client.UriBuilderPlugin
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.applib.client.UriBuilderPlugin
rename to viewers/restfulobjects/applib/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.applib.client.UriBuilderPlugin
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java b/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
rename to viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
diff --git a/core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json b/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
similarity index 100%
rename from core/viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
rename to viewers/restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/.gitignore b/viewers/restfulobjects/jaxrs-resteasy-4/.gitignore
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/.gitignore
rename to viewers/restfulobjects/jaxrs-resteasy-4/.gitignore
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
rename to viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
diff --git a/core/viewers/restfulobjects/pom.xml b/viewers/restfulobjects/pom.xml
similarity index 96%
rename from core/viewers/restfulobjects/pom.xml
rename to viewers/restfulobjects/pom.xml
index 753d28f..3cfc2ad 100644
--- a/core/viewers/restfulobjects/pom.xml
+++ b/viewers/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
 	<artifactId>isis-viewer-restfulobjects</artifactId>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
similarity index 100%
rename from core/viewers/restfulobjects/rendering/pom.xml
rename to viewers/restfulobjects/rendering/pom.xml
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder_Converters.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder_Converters.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder_Converters.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder_Converters.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
rename to viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
similarity index 100%
rename from core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
rename to viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
diff --git a/core/viewers/restfulobjects/src/main/doc/antora.yml b/viewers/restfulobjects/src/main/doc/antora.yml
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/antora.yml
rename to viewers/restfulobjects/src/main/doc/antora.yml
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png b/viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png b/viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc b/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc
similarity index 100%
rename from core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc
rename to viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
similarity index 100%
rename from core/viewers/restfulobjects/viewer/pom.xml
rename to viewers/restfulobjects/viewer/pom.xml
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsSpec.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsSpec.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsSpec.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsSpec.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/FailureUtil.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/FailureUtil.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/FailureUtil.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/FailureUtil.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/00-README.md b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/00-README.md
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/00-README.md
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/00-README.md
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-16x16.png b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-16x16.png
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-16x16.png
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-16x16.png
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-32x32.png b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-32x32.png
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-32x32.png
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/favicon-32x32.png
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/index-ORIG-3.24.3.html b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/index-ORIG-3.24.3.html
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/index-ORIG-3.24.3.html
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/index-ORIG-3.24.3.html
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/oauth2-redirect.html b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/oauth2-redirect.html
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/oauth2-redirect.html
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/oauth2-redirect.html
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css.map b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css.map
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css.map
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.css.map
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js.map b/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js.map
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js.map
rename to viewers/restfulobjects/viewer/src/main/resources/static/swagger-ui/swagger-ui.js.map
diff --git a/core/viewers/restfulobjects/viewer/src/main/resources/swagger-ui/index.thtml b/viewers/restfulobjects/viewer/src/main/resources/swagger-ui/index.thtml
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/main/resources/swagger-ui/index.thtml
rename to viewers/restfulobjects/viewer/src/main/resources/swagger-ui/index.thtml
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
similarity index 100%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
rename to viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
diff --git a/core/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
similarity index 100%
rename from core/viewers/wicket/model/pom.xml
rename to viewers/wicket/model/pom.xml
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
similarity index 100%
rename from core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
similarity index 100%
rename from core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
rename to viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
similarity index 100%
rename from core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
rename to viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
similarity index 100%
rename from core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
rename to viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
similarity index 100%
rename from core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
rename to viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
diff --git a/core/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
similarity index 96%
rename from core/viewers/wicket/pom.xml
rename to viewers/wicket/pom.xml
index 51e0870..45991e5 100644
--- a/core/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-viewer-wicket</artifactId>
diff --git a/core/viewers/wicket/src/main/doc/antora.yml b/viewers/wicket/src/main/doc/antora.yml
similarity index 100%
rename from core/viewers/wicket/src/main/doc/antora.yml
rename to viewers/wicket/src/main/doc/antora.yml
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png b/viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png b/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn b/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn
rename to viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png b/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png b/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png b/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png b/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png b/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png b/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png b/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png b/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png b/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png b/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png b/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png b/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png b/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png b/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png b/viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png b/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png b/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png b/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html b/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
rename to viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png b/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png b/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png b/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png b/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png b/viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png
rename to viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/nav.adoc b/viewers/wicket/src/main/doc/modules/ROOT/nav.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/nav.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/nav.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc b/viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc b/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc b/viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc b/viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
diff --git a/core/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
similarity index 100%
rename from core/viewers/wicket/ui/pom.xml
rename to viewers/wicket/ui/pom.xml
diff --git a/core/viewers/wicket/ui/src/main/java/images/Images.java b/viewers/wicket/ui/src/main/java/images/Images.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/images/Images.java
rename to viewers/wicket/ui/src/main/java/images/Images.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
similarity index 100%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
diff --git a/core/viewers/wicket/ui/src/main/resources/images/Default.png b/viewers/wicket/ui/src/main/resources/images/Default.png
similarity index 100%
rename from core/viewers/wicket/ui/src/main/resources/images/Default.png
rename to viewers/wicket/ui/src/main/resources/images/Default.png
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
similarity index 100%
rename from core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
rename to viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
diff --git a/core/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
similarity index 100%
rename from core/viewers/wicket/viewer/pom.xml
rename to viewers/wicket/viewer/pom.xml
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/CollectionData.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/CollectionData.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/CollectionData.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/CollectionData.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/Data.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/Data.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/Data.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/Data.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectData.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectData.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectData.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectData.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/StandaloneData.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/StandaloneData.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/StandaloneData.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/StandaloneData.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Experimental.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Experimental.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Experimental.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Experimental.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newSession.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newSession.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newSession.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newSession.java
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
diff --git a/core/viewers/wicket/viewer/src/main/resources/log4j.properties b/viewers/wicket/viewer/src/main/resources/log4j.properties
similarity index 100%
rename from core/viewers/wicket/viewer/src/main/resources/log4j.properties
rename to viewers/wicket/viewer/src/main/resources/log4j.properties
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_NotYetImplemented.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_NotYetImplemented.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_NotYetImplemented.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_NotYetImplemented.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
similarity index 100%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
rename to viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java


[isis] 14/21: ISIS-2259: fixes package for isis-core-codegen-bytebuddy

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

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

commit 3ac9f0ff7bd40aabfc10e499cea823c9415badf4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:03:25 2020 +0000

    ISIS-2259: fixes package for isis-core-codegen-bytebuddy
---
 .../isis/{ => core}/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java | 4 ++--
 .../codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java       | 2 +-
 .../codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java      | 2 +-
 .../apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java | 2 +-
 .../org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java    | 2 +-
 .../isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
 .../wrapper/WrapperFactoryDefault_wrappedObject_Test.java             | 2 +-
 .../wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
similarity index 73%
rename from core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
rename to core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
index 8f17fd0..14a624d 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
@@ -1,9 +1,9 @@
-package org.apache.isis.codegen.bytebuddy;
+package org.apache.isis.core.codegen.bytebuddy;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
 import org.apache.isis.commons.IsisModuleCommons;
 
 @Configuration
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
similarity index 98%
rename from core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
rename to core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
index 1a76085..c946f78 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.codegen.bytebuddy.services;
+package org.apache.isis.core.codegen.bytebuddy.services;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
similarity index 99%
rename from core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
rename to core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
index 4e58188..15b7fff 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.codegen.bytebuddy.services;
+package org.apache.isis.core.codegen.bytebuddy.services;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index d950a77..8680278 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
 import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
 import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
 
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index 0244366..fc848ad 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtimeservices;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
 import org.apache.isis.runtime.IsisModuleRuntime;
 import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
 import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 2d8f029..fe279cc 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -26,7 +26,7 @@ import org.jmock.api.Invocation;
 import org.jmock.api.Invokable;
 import org.jmock.lib.JavaReflectionImposteriser;
 
-import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
 
 class ImposteriserUsingCodegenPlugin implements Imposteriser {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index eca3bef..952a927 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.HiddenException;
 import org.apache.isis.applib.services.wrapper.InvalidException;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
 import org.apache.isis.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.metamodel.context.MetaModelContext;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index f3d9137..ccabec9 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
 import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
 import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
 import org.apache.isis.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.metamodel.consent.Allow;


[isis] 05/21: ISIS-2259: introduce parent for viewers/wicket and persistence/jdo

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

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

commit f659d9b2c6a6d7eff65fc76efb83bae9a99f6543
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:15:00 2020 +0000

    ISIS-2259: introduce parent for viewers/wicket and persistence/jdo
---
 antora/playbooks/site-refguide.yml         | 10 ++++---
 antora/playbooks/site.yml                  | 14 +++++-----
 api/applib/pom.xml                         |  1 +
 api/schema/pom.xml                         |  1 +
 core/persistence/jdo/applib/pom.xml        |  5 ++--
 core/persistence/jdo/datanucleus-5/pom.xml |  5 ++--
 core/persistence/jdo/pom.xml               | 38 +++++++++++++++++++++++++++
 core/pom.xml                               | 15 +++--------
 core/viewers/wicket/model/pom.xml          |  3 +--
 core/viewers/wicket/pom.xml                | 42 ++++++++++++++++++++++++++++++
 core/viewers/wicket/ui/pom.xml             |  3 +--
 core/viewers/wicket/viewer/pom.xml         |  3 +--
 12 files changed, 106 insertions(+), 34 deletions(-)

diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index ef1e15b..5fcad68 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -15,15 +15,17 @@ content:
       start_path: antora/components/refguide # refguide
       branches: HEAD
 
-# core
+# api
     - url: .
-      start_path: core/applib/src/main/doc # refguide
+      start_path: api/applib/src/main/doc # refguide
       branches: HEAD
     - url: .
-      start_path: core/config/src/main/doc # refguide
+      start_path: api/schema/src/main/doc # refguide
       branches: HEAD
+
+# core
     - url: .
-      start_path: core/schema/src/main/doc # refguide
+      start_path: core/config/src/main/doc # refguide
       branches: HEAD
 
 
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 56328e2..4367b42 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -45,11 +45,16 @@ content:
       start_path: antora/components/valuetypes # valuetypes
       branches: HEAD
 
-# core
+# api
     - url: .
-      start_path: core/applib/src/main/doc # refguide
+      start_path: api/applib/src/main/doc # refguide
       branches: HEAD
     - url: .
+      start_path: api/schema/src/main/doc # refguide
+      branches: HEAD
+
+# core
+    - url: .
       start_path: core/codegen-bytebuddy/src/main/doc # core
       branches: HEAD
     - url: .
@@ -74,15 +79,12 @@ content:
       start_path: core/webboot-springboot/src/main/doc # core
       branches: HEAD
     - url: .
-      start_path: core/runtime-services/src/main/doc # core
+      start_path: core/runtimeservices/src/main/doc # core
       branches: HEAD
     - url: .
       start_path: core/webapp/src/main/doc # core
       branches: HEAD
     - url: .
-      start_path: core/schema/src/main/doc # refguide
-      branches: HEAD
-    - url: .
       start_path: core/security/api/src/main/doc # security
       branches: HEAD
     - url: .
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 6072156..9d1c6f4 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -24,6 +24,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-applib</artifactId>
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index db4083e..bb7ca79 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -18,6 +18,7 @@
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
+		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-schema</artifactId>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index d6e5978..b529e9f 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -15,14 +15,13 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-persistence-jdo</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-persistence-jdo-applib</artifactId>
 
-	<name>Apache Isis Persistence - JDO Applib</name>
+	<name>Apache Isis Persistence - JDO (applib)</name>
 	<description>
 		Supplementary applib for JDO persistence
     </description>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index f1075de..1ec11b5 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -15,14 +15,13 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-persistence-jdo</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-persistence-jdo-datanucleus5</artifactId>
 
-	<name>Apache Isis Persistence - JDO (Datanucleus 5)</name>
+	<name>Apache Isis Persistence - JDO (datanucleus 5)</name>
 	<description>
         JDO plugin using datanucleus.
     </description>
diff --git a/core/persistence/jdo/pom.xml b/core/persistence/jdo/pom.xml
new file mode 100644
index 0000000..97ea3f7
--- /dev/null
+++ b/core/persistence/jdo/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.core</groupId>
+		<artifactId>isis</artifactId>
+		<version>2.0.0-M3-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>isis-persistence-jdo</artifactId>
+
+	<name>Apache Isis Persistence - JDO</name>
+	<description>
+		Supplementary applib for JDO persistence
+    </description>
+
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>applib</module>
+		<module>datanucleus-5</module>
+	</modules>
+
+
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 87a8d30..e8a7739 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1863,18 +1863,9 @@
 		<module>security/keycloak</module>
 
 		<module>viewers/restfulobjects</module>
-		<module>viewers/restfulobjects/applib</module>
-		<module>viewers/restfulobjects/rendering</module>
-		<module>viewers/restfulobjects/jaxrs-resteasy-4</module>
-		<module>viewers/restfulobjects/viewer</module>
-
-		<module>viewers/wicket/model</module>
-		<module>viewers/wicket/ui</module>
-		<module>viewers/wicket/viewer</module>
-
-		<module>persistence/jdo/applib</module>
-		<module>persistence/jdo/datanucleus-5</module>
-		
+		<module>viewers/wicket</module>
+
+		<module>persistence/jdo</module>
 
 		<!-- to break cyclic dependencies some tests needed to be moved to their 
 			own modules -->
diff --git a/core/viewers/wicket/model/pom.xml b/core/viewers/wicket/model/pom.xml
index 28877a5..3f6c11c 100644
--- a/core/viewers/wicket/model/pom.xml
+++ b/core/viewers/wicket/model/pom.xml
@@ -23,9 +23,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-wicket</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-viewer-wicket-model</artifactId>
diff --git a/core/viewers/wicket/pom.xml b/core/viewers/wicket/pom.xml
new file mode 100644
index 0000000..51e0870
--- /dev/null
+++ b/core/viewers/wicket/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis.core</groupId>
+        <artifactId>isis</artifactId>
+        <version>2.0.0-M3-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>isis-viewer-wicket</artifactId>
+    <name>Apache Isis Viewer - Wicket</name>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>model</module>
+        <module>viewer</module>
+        <module>ui</module>
+    </modules>
+
+</project>
diff --git a/core/viewers/wicket/ui/pom.xml b/core/viewers/wicket/ui/pom.xml
index 96f23ef..beb277f 100644
--- a/core/viewers/wicket/ui/pom.xml
+++ b/core/viewers/wicket/ui/pom.xml
@@ -24,9 +24,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-wicket</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-viewer-wicket-ui</artifactId>
diff --git a/core/viewers/wicket/viewer/pom.xml b/core/viewers/wicket/viewer/pom.xml
index 56a1616..cd5f027 100644
--- a/core/viewers/wicket/viewer/pom.xml
+++ b/core/viewers/wicket/viewer/pom.xml
@@ -23,9 +23,8 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-viewer-wicket</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <name>Apache Isis Viewer - Wicket (Viewer)</name>


[isis] 06/21: ISIS-2259: moves security modules up a level, renames isis-security-api to isis-core-security

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

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

commit c2e1e8de549803db9c68b93d75b7cbc076bf30fb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:26:54 2020 +0000

    ISIS-2259: moves security modules up a level, renames isis-security-api to isis-core-security
---
 antora/playbooks/site.yml                                   |   8 ++++----
 core/metamodel/pom.xml                                      |   2 +-
 core/pom.xml                                                |  10 +++++-----
 core/security/{api => }/pom.xml                             |   4 ++--
 core/security/{shiro => }/src/main/doc/antora.yml           |   0
 .../security-apis-impl/configure-isis-to-use-bypass.PNG     | Bin
 .../doc/modules/shiro => src/main/doc/modules/api}/nav.adoc |   0
 .../{api => }/src/main/doc/modules/api/pages/about.adoc     |   0
 .../src/main/doc/modules/api/partials/module-nav.adoc       |   0
 .../org/apache/isis/security/api/IsisModuleSecurityApi.java |   0
 .../security/api/authentication/AuthenticationRequest.java  |   0
 .../api/authentication/AuthenticationRequestAbstract.java   |   0
 .../api/authentication/AuthenticationRequestPassword.java   |   0
 .../security/api/authentication/AuthenticationSession.java  |   0
 .../api/authentication/AuthenticationSessionAbstract.java   |   0
 .../api/authentication/AuthenticationSessionProvider.java   |   0
 .../isis/security/api/authentication/MessageBroker.java     |   0
 .../fixtures/AuthenticationRequestLogonFixture.java         |   0
 .../api/authentication/health/HealthAuthSession.java        |   0
 .../api/authentication/manager/AuthenticationManager.java   |   0
 .../api/authentication/manager/RegistrationDetails.java     |   0
 .../singleuser/AuthenticationRequestSingleUser.java         |   0
 .../api/authentication/singleuser/SingleUserSession.java    |   0
 .../security/api/authentication/standard/Authenticator.java |   0
 .../api/authentication/standard/AuthenticatorAbstract.java  |   0
 .../authentication/standard/NoAuthenticatorException.java   |   0
 .../api/authentication/standard/RandomCodeGenerator.java    |   0
 .../authentication/standard/RandomCodeGeneratorDefault.java |   0
 .../security/api/authentication/standard/Registrar.java     |   0
 .../standard/RegistrationDetailsPassword.java               |   0
 .../security/api/authentication/standard/SimpleSession.java |   0
 .../api/authorization/manager/AuthorizationManager.java     |   0
 .../api/authorization/standard/AuthorizationConstants.java  |   0
 .../security/api/authorization/standard/Authorizor.java     |   0
 .../org/apache/isis/security/EncodabilityContractTest.java  |   0
 .../standard/AuthenticationManager_authenticators_Test.java |   0
 .../authentication/standard/AuthenticatorDefaultTest.java   |   0
 .../standard/SimpleSessionEncodabilityNoRolesTest.java      |   0
 .../standard/SimpleSessionEncodabilityTestAbstract.java     |   0
 .../standard/SimpleSessionEncodabilityWithRolesTest.java    |   0
 .../StandardAuthenticationManager_AuthenticationTest.java   |   0
 core/testsupport/integtestsupport/pom.xml                   |   2 +-
 extensions/security/secman/pom.xml                          |   2 +-
 legacy/testing/mavenplugin/pom.xml                          |   2 +-
 mavendeps/webapp/pom.xml                                    |   2 +-
 {core/security => security}/bypass/pom.xml                  |   2 +-
 .../keycloak => security/bypass}/src/main/doc/antora.yml    |   0
 .../security-apis-impl/configure-isis-to-use-bypass.PNG     | Bin
 .../bypass/src/main/doc/modules/bypass}/nav.adoc            |   0
 .../bypass/src/main/doc/modules/bypass/pages/about.adoc     |   0
 .../src/main/doc/modules/bypass/partials/module-nav.adoc    |   0
 .../isis/security/bypass/IsisModuleSecurityBypass.java      |   0
 .../security/bypass/authentication/AuthenticatorBypass.java |   0
 .../security/bypass/authorization/AuthorizorBypass.java     |   0
 {core/security/shiro => security/keycloak}/NOTICE           |   0
 {core/security => security}/keycloak/pom.xml                |   2 +-
 .../bypass => security/keycloak}/src/main/doc/antora.yml    |   0
 .../keycloak/src/main/doc/modules/keycloak}/nav.adoc        |   0
 .../keycloak/src/main/doc/modules/keycloak/pages/about.adoc |   0
 .../src/main/doc/modules/keycloak/partials/module-nav.adoc  |   0
 .../isis/security/keycloak/IsisModuleSecurityKeycloak.java  |   0
 .../keycloak/authentication/AuthenticatorKeycloak.java      |   0
 .../security/keycloak/authorization/AuthorizorKeycloak.java |   0
 .../isis/security/keycloak/webmodule/KeycloakFilter.java    |   0
 .../isis/security/keycloak/webmodule/WebModuleKeycloak.java |   0
 {core/security/keycloak => security/shiro}/NOTICE           |   0
 {core/security => security}/shiro/pom.xml                   |   2 +-
 .../security/api => security/shiro}/src/main/doc/antora.yml |   0
 .../images/configuration/configure-isis-to-use-shiro.png    | Bin
 .../ini/configure-shiro-to-use-ini-realm.png                | Bin
 .../jdbc/configure-shiro-to-use-custom-jdbc-realm.png       | Bin
 .../configuring-shiro/ldap/activeds-ldap-groups.png         | Bin
 .../configuring-shiro/ldap/activeds-ldap-mojo-partition.png | Bin
 .../configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png  | Bin
 .../ldap/activeds-ldap-sasl-authentication.png              | Bin
 .../configuring-shiro/ldap/activeds-ldap-users.png          | Bin
 .../ldap/configure-shiro-to-use-isis-ldap-realm.png         | Bin
 .../shiro/src/main/doc/modules/shiro}/nav.adoc              |   0
 .../shiro/src/main/doc/modules/shiro/pages/about.adoc       |   0
 .../shiro/pages/about/configuring-isis-to-use-shiro.adoc    |   0
 .../shiro/pages/about/enhanced-wildcard-permission.adoc     |   0
 .../src/main/doc/modules/shiro/pages/about/ini-realm.adoc   |   0
 .../src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc  |   0
 .../src/main/doc/modules/shiro/pages/about/ldap-realm.adoc  |   0
 .../src/main/doc/modules/shiro/pages/about/run-as.adoc      |   0
 .../main/doc/modules/shiro/pages/about/shiro-caching.adoc   |   0
 .../src/main/doc/modules/shiro/partials/module-nav.adoc     |   0
 .../apache/isis/security/shiro/IsisModuleSecurityShiro.java |   0
 .../security/shiro/authentication/AuthenticatorShiro.java   |   0
 .../isis/security/shiro/authorization/AuthorizorShiro.java  |   0
 .../isis/security/shiro/authorization/IsisPermission.java   |   0
 .../shiro/authorization/IsisPermissionResolver.java         |   0
 .../isis/security/shiro/context/ShiroSecurityContext.java   |   0
 .../shiro/permrolemapper/PermissionToRoleMapper.java        |   0
 .../shiro/permrolemapper/PermissionToRoleMapperFromIni.java |   0
 .../permrolemapper/PermissionToRoleMapperFromString.java    |   0
 .../org/apache/isis/security/shiro/permrolemapper/Util.java |   0
 .../isis/security/shiro/webmodule/WebModuleShiro.java       |   0
 .../isis/security/shiro/IsisPermissionTest_setParts.java    |   0
 .../security/shiro/IsisPermissionTest_typicalUsage.java     |   0
 .../ShiroAuthenticatorOrAuthorizorTest_authenticate.java    |   0
 ...iroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java |   0
 .../shiro/authorization/IsisPermissionTest_equals.java      |   0
 .../permrolemapper/PermissionToRoleMapperFromIniTest.java   |   0
 .../PermissionToRoleMapperFromStringTest.java               |   0
 .../isis/security/shiro/permrolemapper/UtilTest_parse.java  |   0
 .../org/apache/isis/security/shiro/permrolemapper/my.ini    |   0
 .../shiro/src/test/resources/shiro.ini                      |   0
 .../ComparableByTitleContractTestAbstract_compareTo.java    |   2 --
 subdomains/excel/testing/pom.xml                            |   6 ++++++
 .../fakedata/fixtures/IsisModuleTstFakeDataFixtures.java    |   4 ++--
 .../ui/components/AsciiDocPanelFactoriesForWicket.java      |   2 +-
 112 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 4367b42..15d28b5 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -85,16 +85,16 @@ content:
       start_path: core/webapp/src/main/doc # core
       branches: HEAD
     - url: .
-      start_path: core/security/api/src/main/doc # security
+      start_path: core/security/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: core/security/bypass/src/main/doc # security
+      start_path: security/bypass/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: core/security/shiro/src/main/doc # security
+      start_path: security/shiro/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: core/security/keycloak/src/main/doc # security
+      start_path: security/keycloak/src/main/doc # security
       branches: HEAD
     - url: .
       start_path: core/testsupport/unittestsupport/src/main/doc # testing
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 784478f..a8c428a 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -76,7 +76,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-security-api</artifactId>
+            <artifactId>isis-core-security</artifactId>
         </dependency>
 
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index e8a7739..b2f20a2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -851,7 +851,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-security-api</artifactId>
+				<artifactId>isis-core-security</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -1857,10 +1857,10 @@
 		<module>testsupport/unittestsupport</module>
 		<module>testsupport/integtestsupport</module>
 
-		<module>security/api</module>
-		<module>security/bypass</module>
-		<module>security/shiro</module>
-		<module>security/keycloak</module>
+		<module>security</module>
+		<module>../security/bypass</module>
+		<module>../security/shiro</module>
+		<module>../security/keycloak</module>
 
 		<module>viewers/restfulobjects</module>
 		<module>viewers/wicket</module>
diff --git a/core/security/api/pom.xml b/core/security/pom.xml
similarity index 96%
rename from core/security/api/pom.xml
rename to core/security/pom.xml
index efc15a1..d1d356a 100644
--- a/core/security/api/pom.xml
+++ b/core/security/pom.xml
@@ -27,8 +27,8 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-security-api</artifactId>
-    <name>Apache Isis Security - API</name>
+    <artifactId>isis-core-security</artifactId>
+    <name>Apache Isis Core - Security</name>
 
     <properties>
         <jar-plugin.automaticModuleName>org.apache.isis.security.api</jar-plugin.automaticModuleName>
diff --git a/core/security/shiro/src/main/doc/antora.yml b/core/security/src/main/doc/antora.yml
similarity index 100%
rename from core/security/shiro/src/main/doc/antora.yml
rename to core/security/src/main/doc/antora.yml
diff --git a/core/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/shiro/src/main/doc/modules/shiro/nav.adoc b/core/security/src/main/doc/modules/api/nav.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/nav.adoc
rename to core/security/src/main/doc/modules/api/nav.adoc
diff --git a/core/security/api/src/main/doc/modules/api/pages/about.adoc b/core/security/src/main/doc/modules/api/pages/about.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/pages/about.adoc
rename to core/security/src/main/doc/modules/api/pages/about.adoc
diff --git a/core/security/api/src/main/doc/modules/api/partials/module-nav.adoc b/core/security/src/main/doc/modules/api/partials/module-nav.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/partials/module-nav.adoc
rename to core/security/src/main/doc/modules/api/partials/module-nav.adoc
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java b/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
rename to core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
rename to core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 73f0445..af521c4 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -138,7 +138,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-security-api</artifactId>
+			<artifactId>isis-core-security</artifactId>
 		</dependency>
 		
 		<dependency>
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index f6d00c0..d01ecf6 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -77,7 +77,7 @@
 	
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-security-api</artifactId>
+			<artifactId>isis-core-security</artifactId>
 		</dependency>
 
     </dependencies>
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6c53607..029e5e7 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -74,7 +74,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-security-api</artifactId>
+			<artifactId>isis-core-security</artifactId>
 		</dependency>
 		
 		<dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 5c316ce..3bf1fff 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -112,7 +112,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-security-api</artifactId>
+			<artifactId>isis-core-security</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
diff --git a/core/security/bypass/pom.xml b/security/bypass/pom.xml
similarity index 96%
rename from core/security/bypass/pom.xml
rename to security/bypass/pom.xml
index a8c672e..4e9446f 100644
--- a/core/security/bypass/pom.xml
+++ b/security/bypass/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-security-bypass</artifactId>
diff --git a/core/security/keycloak/src/main/doc/antora.yml b/security/bypass/src/main/doc/antora.yml
similarity index 100%
rename from core/security/keycloak/src/main/doc/antora.yml
rename to security/bypass/src/main/doc/antora.yml
diff --git a/core/security/api/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/nav.adoc b/security/bypass/src/main/doc/modules/bypass/nav.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/nav.adoc
rename to security/bypass/src/main/doc/modules/bypass/nav.adoc
diff --git a/core/security/bypass/src/main/doc/modules/bypass/pages/about.adoc b/security/bypass/src/main/doc/modules/bypass/pages/about.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/pages/about.adoc
rename to security/bypass/src/main/doc/modules/bypass/pages/about.adoc
diff --git a/core/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc b/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
rename to security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
diff --git a/core/security/shiro/NOTICE b/security/keycloak/NOTICE
similarity index 100%
rename from core/security/shiro/NOTICE
rename to security/keycloak/NOTICE
diff --git a/core/security/keycloak/pom.xml b/security/keycloak/pom.xml
similarity index 98%
rename from core/security/keycloak/pom.xml
rename to security/keycloak/pom.xml
index 845ec24..0c52b6b 100644
--- a/core/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
     	<version>2.0.0-M3-SNAPSHOT</version>
-    	<relativePath>../../pom.xml</relativePath>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-security-keycloak</artifactId>
diff --git a/core/security/bypass/src/main/doc/antora.yml b/security/keycloak/src/main/doc/antora.yml
similarity index 100%
rename from core/security/bypass/src/main/doc/antora.yml
rename to security/keycloak/src/main/doc/antora.yml
diff --git a/core/security/bypass/src/main/doc/modules/bypass/nav.adoc b/security/keycloak/src/main/doc/modules/keycloak/nav.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/nav.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/nav.adoc
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc b/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc b/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
diff --git a/core/security/keycloak/NOTICE b/security/shiro/NOTICE
similarity index 100%
rename from core/security/keycloak/NOTICE
rename to security/shiro/NOTICE
diff --git a/core/security/shiro/pom.xml b/security/shiro/pom.xml
similarity index 98%
rename from core/security/shiro/pom.xml
rename to security/shiro/pom.xml
index 64cbb5b..a057591 100644
--- a/core/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
     	<version>2.0.0-M3-SNAPSHOT</version>
-    	<relativePath>../../pom.xml</relativePath>
+        <relativePath>../../core/pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-security-shiro</artifactId>
diff --git a/core/security/api/src/main/doc/antora.yml b/security/shiro/src/main/doc/antora.yml
similarity index 100%
rename from core/security/api/src/main/doc/antora.yml
rename to security/shiro/src/main/doc/antora.yml
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
diff --git a/core/security/api/src/main/doc/modules/api/nav.adoc b/security/shiro/src/main/doc/modules/shiro/nav.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/nav.adoc
rename to security/shiro/src/main/doc/modules/shiro/nav.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc b/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
rename to security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
diff --git a/core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini b/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
similarity index 100%
rename from core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
rename to security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
diff --git a/core/security/shiro/src/test/resources/shiro.ini b/security/shiro/src/test/resources/shiro.ini
similarity index 100%
rename from core/security/shiro/src/test/resources/shiro.ini
rename to security/shiro/src/test/resources/shiro.ini
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
index 69938ad..68bbc42 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -8,8 +8,6 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByTitleContractTester;
-
 public abstract class ComparableByTitleContractTestAbstract_compareTo {
     protected final String packagePrefix;
     protected Map<Class<?>, Class<?>> noninstantiableSubstitutes;
diff --git a/subdomains/excel/testing/pom.xml b/subdomains/excel/testing/pom.xml
index 75890bd..27f03ac 100644
--- a/subdomains/excel/testing/pom.xml
+++ b/subdomains/excel/testing/pom.xml
@@ -33,6 +33,12 @@
             <artifactId>isis-subdomains-excel-applib</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
index c90ac12..e1068df 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
@@ -4,14 +4,14 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.extensions.fakedata.dom.IsisModuleExtFakeData;
+import org.apache.isis.testing.fakedata.applib.IsisModuleTstFakeDataApplib;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
 import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
 
 @Configuration
 @Import({
-        IsisModuleExtFakeData.class
+        IsisModuleTstFakeDataApplib.class
 })
 @ComponentScan
 public class IsisModuleTstFakeDataFixtures implements ModuleWithFixtures {
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
index caeec8c..e22a015 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
@@ -21,7 +21,7 @@ package org.apache.isis.valuetypes.asciidoc.ui.components;
 
 import org.springframework.stereotype.Component;
 
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
 import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
 


[isis] 10/21: ISIS-2259: adds parent module for integtestsupport

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

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

commit bdef229bc2bb5c6d8d945c9437a1106be6c20bab
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:51:22 2020 +0000

    ISIS-2259: adds parent module for integtestsupport
---
 core/pom.xml                                       |   1 -
 testing/integtestsupport/{ => applib}/pom.xml      |  15 +-
 .../applib}/ExceptionRecognizerTranslate.java      |   2 +-
 .../applib}/IsisIntegrationTestAbstract.java       |   2 +-
 .../applib}/ThrowableMatchers.java                 |   2 +-
 .../applib}/validate/ValidateDomainModel.java      |   2 +-
 testing/integtestsupport/pom.xml                   | 177 +--------------------
 testing/pom.xml                                    |   4 +-
 8 files changed, 20 insertions(+), 185 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 750a0de..09b798c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1850,7 +1850,6 @@
 		<module>webboot-springboot</module>
 
 		<module>testsupport/unittestsupport</module>
-		<module>../testing/integtestsupport</module>
 
 		<module>security</module>
 		<module>../security/bypass</module>
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/applib/pom.xml
similarity index 91%
copy from testing/integtestsupport/pom.xml
copy to testing/integtestsupport/applib/pom.xml
index a54f2a9..e1322ba 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -15,24 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<groupId>org.apache.isis.testing</groupId>
+		<artifactId>isis-testing-integtestsupport</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-testing-integtestsupport-applib</artifactId>
-	<name>Apache Isis Testing - Integ Test Support</name>
+	<name>Apache Isis Testing - Integ Test Support (applib)</name>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.testing.integtestsupport.applib</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/testing/integtestsupport/applib</git-plugin.propertiesDir>
 	</properties>
 
-	<description>
-        Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
-    </description>
-
 	<dependencies>
 
 		<dependency>
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
similarity index 97%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
index 0815dab..e2aa4ee 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
 
 import org.junit.rules.MethodRule;
 import org.junit.runners.model.FrameworkMethod;
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
similarity index 98%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
index bedb4eb..4e51396 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
 
 import javax.inject.Inject;
 
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
similarity index 96%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
index 7ab8e65..30077b5 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
 
 import java.util.List;
 
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
similarity index 98%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
index 639d080..787df42 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.integtestsupport.validate;
+package org.apache.isis.testing.integtestsupport.applib.validate;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index a54f2a9..b1752c8 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -15,183 +15,22 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<groupId>org.apache.isis.testing</groupId>
+		<artifactId>isis-testing</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-testing-integtestsupport-applib</artifactId>
-	<name>Apache Isis Testing - Integ Test Support</name>
-
-	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
-	</properties>
+	<artifactId>isis-testing-integtestsupport</artifactId>
+	<name>Apache Isis Testing - Integ Test Support (parent)</name>
 
 	<description>
         Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
     </description>
 
-	<dependencies>
-
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>net.bytebuddy</groupId>
-			<artifactId>byte-buddy</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>net.bytebuddy</groupId>
-					<artifactId>byte-buddy</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>net.bytebuddy</groupId>
-					<artifactId>byte-buddy-agent</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- framework default codegen for tests -->
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-codegen-bytebuddy</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- JDO API (non transient, provided by plugin) -->
-		<dependency>
-			<groupId>javax.jdo</groupId>
-			<artifactId>jdo-api</artifactId>
-			<version>${jdo-api.version}</version>
-			<!-- provided by plugins -->
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<!-- convergence issues from spring-boot-starter-log4j2 -->
-			<version>${slf4j-api.version}</version>
-		</dependency>
-
-
-		<!-- SPRING -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.ow2.asm</groupId>
-					<artifactId>asm</artifactId>
-				</exclusion>
-				<exclusion>
-					<!-- when spring-boot release lags behind spring-core release explicitly
-						spring-test added below -->
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-test</artifactId>
-				</exclusion>
-				<exclusion>
-					<!-- when spring-boot release lags behind spring-core release explicitly
-						spring-test added below -->
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<!-- we use log4j-2 instead -->
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-security</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-security-bypass</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-runtime</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-runtimeservices</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-webboot-springboot</artifactId>
-		</dependency>
-	</dependencies>
-
-	<profiles>
+	<packaging>pom</packaging>
 
-		<profile>
-			<id>jdk11-supplemental</id>
-			<activation>
-				<jdk>[11,)</jdk>
-			</activation>
-			<!--
-			These dependencies are required in order to build on jdk11
-			-->
-			<dependencies>
-				<dependency>
-					<groupId>com.sun.xml.ws</groupId>
-					<artifactId>jaxws-ri</artifactId>
-					<type>pom</type>
-				</dependency>
-				<dependency>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-core</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
+	<modules>
+		<module>applib</module>
+	</modules>
 
 </project>
diff --git a/testing/pom.xml b/testing/pom.xml
index 446c902..9b332c4 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -129,8 +129,10 @@
 		<module>hsqldbmgr</module>
 		<module>specsupport</module>
 
+		<module>integtestsupport</module>
+		<module>integtestsupport/applib</module>
+
 		<module>unittestsupport</module>
-		<module>unittestsupport/applib</module>
 	</modules>
 
 	<profiles>


[isis] 21/21: Merge remote-tracking branch 'origin/master' into ide

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

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

commit 868a69c055362ff830e4a02444bad00955ab4a30
Merge: 31b8b21 ba33cc2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:21:34 2020 +0000

    Merge remote-tracking branch 'origin/master' into ide
    
    # Conflicts:
    #	core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
    #	core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
    #	core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
    #	core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
    #	core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
    #	valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java

 .../isis/core/config/viewer/wicket/WebAppContextPath.java |  2 ++
 .../modules/templresources/TemplateResourceServlet.java   |  9 ++++-----
 .../webapp/webappctx/IsisWebAppContextInitializer.java    | 15 ++++++++++++++-
 .../runtime/jee_support/IsisCDIBeanScanInterceptor.java   |  2 ++
 .../isis/security/shiro/webmodule/WebModuleShiro.java     | 10 ++++++++++
 .../sse/ui/webmodule/ServerSentEventsServlet.java         |  6 +++---
 .../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java | 14 ++++++++++++++
 .../viewer/webmodule/IsisRestfulObjectsSessionFilter.java |  8 ++++----
 .../webmodule/IsisTransactionFilterForRestfulObjects.java |  6 +++---
 9 files changed, 56 insertions(+), 16 deletions(-)

diff --cc core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
index 6130055,0000000..de8f391
mode 100644,000000..100644
--- a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
@@@ -1,100 -1,0 +1,102 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *        http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +package org.apache.isis.core.config.viewer.wicket;
 +
 +import java.io.Serializable;
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
 +
 +import javax.inject.Named;
 +import javax.inject.Singleton;
 +
 +import org.springframework.beans.factory.annotation.Qualifier;
 +import org.springframework.context.annotation.Primary;
 +import org.springframework.core.annotation.Order;
 +import org.springframework.stereotype.Service;
 +
 +import org.apache.isis.applib.annotation.OrderPrecedence;
 +import org.apache.isis.core.commons.internal.base._Strings;
 +import org.apache.isis.core.commons.internal.resources._Resources;
 +
 +import lombok.Getter;
 +
 +/**
 + * This class is {@link Serializable} so that it can be injected into Wicket components.
 + */
 +@Service
 +@Singleton
 +@Named("isisConfig.WebAppContextPath")
 +@Order(OrderPrecedence.MIDPOINT)
 +@Primary
 +@Qualifier("Default")
 +public class WebAppContextPath implements Serializable {
 +
++    private static final long serialVersionUID = 1L;
++
 +    /**
 +     * In the form "xxx/yyy" (no leading nor trailing '/').
 +     */
 +    @Getter
 +    private String contextPath = "";
 +    private static final Pattern pattern = Pattern.compile("^[/]*(.+?)[/]*$");;
 +
 +    public void setContextPath(final String contextPath) {
 +        if(contextPath == null) {
 +            this.contextPath = "";
 +            return;
 +        }
 +        final Matcher matcher = pattern.matcher(contextPath);
 +        this.contextPath = matcher.matches()
 +                                ? matcher.group(1)
 +                                : "";
 +    }
 +
 +    public final String prependContextPath(String path) {
 +
 +        if(path==null) {
 +            return getContextPath();
 +        }
 +
 +        final String contextPath = getContextPath();
 +        if(_Strings.isNullOrEmpty(contextPath)) {
 +            return path;
 +        }
 +
 +        return contextPath + prefixed(path, "/");
 +    }
 +
 +    private static String prefixed(final String path, final String prefix) {
 +        return !path.startsWith(prefix)
 +                ? prefix + path
 +                : path;
 +    }
 +
 +    public String prependContextPathIfLocal(String url) {
 +
 +        if(url==null) {
 +            return null;
 +        }
 +        if(_Resources.isLocalResource(url)) {
 +            return this.prependContextPath(url);
 +        }
 +        return url;
 +    }
 +
 +
 +}
diff --cc core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
index b6f1c92,0a35c02..e79aaa3
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
@@@ -30,16 -29,18 +29,18 @@@ import javax.servlet.http.HttpServlet
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
+ import org.springframework.beans.factory.annotation.Autowired;
+ 
 -import org.apache.isis.commons.internal.base._Bytes;
 -import org.apache.isis.commons.internal.base._Strings;
 -import org.apache.isis.config.RestEasyConfiguration;
 -import org.apache.isis.config.viewer.wicket.WebAppContextPath;
 -import org.apache.isis.metamodel.commons.InputStreamExtensions;
 -import org.apache.isis.metamodel.commons.ResourceUtil;
 -import org.apache.isis.metamodel.commons.StringExtensions;
 -
 -import static org.apache.isis.commons.internal.base._Strings.pair;
 -import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
 +import org.apache.isis.core.commons.internal.base._Bytes;
 +import org.apache.isis.core.commons.internal.base._Strings;
 +import org.apache.isis.core.config.RestEasyConfiguration;
 +import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 +import org.apache.isis.core.metamodel.commons.InputStreamExtensions;
 +import org.apache.isis.core.metamodel.commons.ResourceUtil;
 +import org.apache.isis.core.metamodel.commons.StringExtensions;
 +
 +import static org.apache.isis.core.commons.internal.base._Strings.pair;
 +import static org.apache.isis.core.commons.internal.base._With.ifPresentElseGet;
  
  import lombok.val;
  import lombok.extern.log4j.Log4j2;
diff --cc core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
index 7d85cc7,2a9507b..ce8a93b
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
@@@ -27,11 -28,12 +28,12 @@@ import javax.servlet.ServletContextList
  import javax.servlet.ServletException;
  
  import org.springframework.boot.web.servlet.ServletContextInitializer;
+ import org.springframework.stereotype.Component;
  
  import org.apache.isis.applib.services.registry.ServiceRegistry;
 -import org.apache.isis.commons.internal.context._Context;
 -import org.apache.isis.config.IsisConfiguration;
 -import org.apache.isis.config.viewer.wicket.WebAppContextPath;
 +import org.apache.isis.core.commons.internal.context._Context;
 +import org.apache.isis.core.config.IsisConfiguration;
 +import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
  import org.apache.isis.webapp.modules.WebModule;
  import org.apache.isis.webapp.modules.WebModuleContext;
  
diff --cc security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 35ab433,0000000..c194969
mode 100644,000000..100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@@ -1,192 -1,0 +1,202 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *        http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +package org.apache.isis.security.shiro.webmodule;
 +
 +import java.util.Collection;
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +import javax.inject.Inject;
 +import javax.inject.Named;
 +import javax.servlet.ServletContext;
++import javax.servlet.ServletContextEvent;
 +import javax.servlet.ServletContextListener;
 +import javax.servlet.ServletException;
 +
 +import org.apache.shiro.config.Ini;
 +import org.apache.shiro.realm.Realm;
 +import org.apache.shiro.web.env.EnvironmentLoaderListener;
 +import org.apache.shiro.web.env.IniWebEnvironment;
 +import org.apache.shiro.web.env.WebEnvironment;
 +import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
 +import org.apache.shiro.web.servlet.ShiroFilter;
 +import org.springframework.beans.factory.annotation.Qualifier;
 +import org.springframework.core.annotation.Order;
 +import org.springframework.stereotype.Service;
 +import org.springframework.util.ReflectionUtils;
 +
 +import org.apache.isis.applib.annotation.OrderPrecedence;
 +import org.apache.isis.applib.services.inject.ServiceInjector;
 +import org.apache.isis.core.commons.collections.Can;
 +import org.apache.isis.core.commons.internal._Constants;
 +import org.apache.isis.core.commons.internal.base._Strings;
++import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 +import org.apache.isis.webapp.modules.WebModuleAbstract;
 +import org.apache.isis.webapp.modules.WebModuleContext;
 +
 +import lombok.Getter;
 +import lombok.NoArgsConstructor;
 +import lombok.SneakyThrows;
 +import lombok.val;
 +
 +/**
 + * WebModule to enable support for Shiro.
 + * <p>
 + * Can be customized via static {@link WebModuleShiro#setShiroEnvironmentClass(Class)}
 + * @since 2.0
 + */
 +@Service
 +@Named("isisSecurityKeycloak.WebModuleKeycloak")
 +@Order(OrderPrecedence.HIGHEST + 200)
 +@Qualifier("Shiro")
 +public class WebModuleShiro extends WebModuleAbstract {
 +    
 +
 +    private final static String SHIRO_FILTER_NAME = "ShiroFilter";
 +
 +    @Inject
 +    public WebModuleShiro(final ServiceInjector serviceInjector) {
 +        super(serviceInjector);
 +    }
 +
 +    // -- CONFIGURATION
 +
 +    public static void setShiroEnvironmentClass(Class<? extends WebEnvironment> shiroEnvironmentClass) {
 +        if(shiroEnvironmentClass==null) {
 +            System.setProperty("shiroEnvironmentClass", null);
 +            return;
 +        } 
 +        System.setProperty("shiroEnvironmentClass", shiroEnvironmentClass.getName());
 +    }
 +
 +    public static class IniWebEnvironmentUsingSystemProperty extends IniWebEnvironment {
 +        @Override
 +        public Ini getIni() {
 +            val customShiroIniResource = System.getProperty("shiroIniResource");
 +            if(_Strings.isNotEmpty(customShiroIniResource)) {
 +                val ini = new Ini();
 +                ini.loadFromPath(customShiroIniResource);
 +                return ini;	
 +            } 
 +            return null;
 +        }
 +        // see https://issues.apache.org/jira/browse/SHIRO-610
 +        @Override
 +        protected Map<String, Object> getDefaults() {
 +            Map<String, Object> defaults = new HashMap<String, Object>();
 +            defaults.put(FILTER_CHAIN_RESOLVER_NAME, new PathMatchingFilterChainResolver());
 +            return defaults;
 +        }
 +    }
 +
 +    public static void setShiroIniResource(String resourcePath) {
 +        if(resourcePath==null) {
 +            System.setProperty("shiroIniResource", null);
 +            setShiroEnvironmentClass(null);
 +            return;
 +        }
 +        System.setProperty("shiroIniResource", resourcePath);
 +        setShiroEnvironmentClass(IniWebEnvironmentUsingSystemProperty.class);
 +    }
 +    
 +    /**
 +     * Adds support for dependency injection into security realms
 +     * @since 2.0
 +     */
 +    @NoArgsConstructor // don't remove, this is class is managed by Isis
 +    public static class EnvironmentLoaderListenerForIsis extends EnvironmentLoaderListener {
 +
 +        @Inject private ServiceInjector serviceInjector;
 +
 +        // testing support
 +        public EnvironmentLoaderListenerForIsis(ServiceInjector serviceInjector) {
 +            this.serviceInjector = serviceInjector;
 +        }
 +
++        @Override
++        public void contextInitialized(ServletContextEvent sce) {
++            System.err.println("intercepted: " + this);
++            _Exceptions.dumpStackTrace();
++            System.err.println("======================================================");
++            super.contextInitialized(sce);
++        }
++
 +        @Override 
 +        protected WebEnvironment createEnvironment(ServletContext servletContext) {
 +            val shiroEnvironment = super.createEnvironment(servletContext);
 +            val securityManager = shiroEnvironment.getSecurityManager();
 +
 +            injectServicesIntoRealms(securityManager);
 +            
 +            return shiroEnvironment;
 +        }
 +        
 +        @SuppressWarnings("unchecked")
 +        @SneakyThrows
 +        public void injectServicesIntoRealms(
 +                org.apache.shiro.mgt.SecurityManager securityManager) {
 +
 +            // reflective access to SecurityManager.getRealms()
 +            val realms = (Collection<Realm>) ReflectionUtils
 +                    .findMethod(securityManager.getClass(), "getRealms")
 +                    .invoke(securityManager, _Constants.emptyObjects);
 +
 +            realms.stream().forEach(serviceInjector::injectServicesInto);
 +        }
 +        
 +    }
 +
 +    // -- 
 +
 +    @Getter
 +    private final String name = "Shiro";
 +
 +    @Override
 +    public void prepare(final WebModuleContext ctx) {
 +        super.prepare(ctx);
 +        val customShiroEnvironmentClassName = System.getProperty("shiroEnvironmentClass");
 +        if(_Strings.isEmpty(customShiroEnvironmentClassName)) {
 +            setShiroEnvironmentClass(IniWebEnvironmentUsingSystemProperty.class);
 +        }
 +    }
 +
 +    @Override
 +    public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
 +
 +        registerFilter(ctx, SHIRO_FILTER_NAME, ShiroFilter.class)
 +            .ifPresent(filterReg -> {
 +                filterReg.addMappingForUrlPatterns(
 +                        null,
 +                        false, // filter is forced first
 +                        "/*");
 +            });
 +
 +        val customShiroEnvironmentClassName = System.getProperty("shiroEnvironmentClass");
 +        if(_Strings.isNotEmpty(customShiroEnvironmentClassName)) {
 +            ctx.setInitParameter("shiroEnvironmentClass", customShiroEnvironmentClassName);
 +        }
 +
 +        val listener = createListener(EnvironmentLoaderListenerForIsis.class);
 +        return Can.ofSingleton(listener);
 +
 +    }
 +
 +
 +
 +}
diff --cc valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
index 7a706e3,0000000..a4484a0
mode 100644,000000..100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
@@@ -1,165 -1,0 +1,165 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *        http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +package org.apache.isis.extensions.sse.ui.webmodule;
 +
 +import java.io.IOException;
 +import java.util.Optional;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.ForkJoinPool;
 +
- import javax.inject.Inject;
 +import javax.servlet.AsyncContext;
 +import javax.servlet.ServletException;
 +import javax.servlet.http.HttpServlet;
 +import javax.servlet.http.HttpServletRequest;
 +import javax.servlet.http.HttpServletResponse;
 +
++import org.springframework.beans.factory.annotation.Autowired;
++
 +import org.apache.isis.applib.util.JaxbAdapters;
 +import org.apache.isis.core.commons.internal.base._Strings;
 +import org.apache.isis.core.commons.internal.context._Context;
 +import org.apache.isis.extensions.sse.applib.service.SseChannel;
 +import org.apache.isis.extensions.sse.applib.service.SseService;
 +import org.apache.isis.extensions.sse.applib.value.ListeningMarkup;
 +
 +import static org.apache.isis.core.commons.internal.base._With.requires;
 +
 +import lombok.val;
 +
 +/**
 + * Server-sent events.
 + *  
 + * @see <a href="https://www.w3schools.com/html/html5_serversentevents.asp">Server Sent Events (@ w3schools)</a>
 + * 
 + * @since 2.0
 + *
 + */
 +//@WebServlet(value="/sse", asyncSupported=true)
 +public class ServerSentEventsServlet extends HttpServlet {
 +    private static final long serialVersionUID = 1L;
 +    private ExecutorService threadPool;
 +
-     @Inject
-     private SseService sseService;
++    @Autowired private SseService sseService;
 +
 +    @Override
 +    public void init() throws ServletException {
 +        super.init();
 +        threadPool = ForkJoinPool.commonPool();
 +        
 +        requires(sseService, "sseService");
 +    }
 +
 +    @Override
 +    public void destroy() {
 +        threadPool.shutdown();
 +        super.destroy();
 +    }
 +
 +    @Override
 +    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 +
 +        val eventStreamType = parseEventStreamType(request);
 +        val eventStream = eventStreamType.flatMap(sseService::lookupByType)
 +                .orElse(null);
 +
 +        if(eventStream==null) {
 +            response.setStatus(200);
 +            response.setContentType(null);
 +            response.flushBuffer();
 +            return;
 +        }
 +
 +        response.setStatus(200);
 +        response.setContentType("text/event-stream");
 +        response.setCharacterEncoding("UTF-8");
 +        //response.setHeader("Access-Control-Allow-Origin", "*"); // not secure, can be used for debugging
 +        response.setHeader("Cache-Control", "no-cache,no-store");
 +        response.flushBuffer();
 +
 +        final AsyncContext asyncContext = request.startAsync();
 +
 +        //XXX javac explicitly requires curly-braces here (to tell it we want a Runnable)
 +        threadPool.submit(()->{fork(asyncContext, eventStream);});
 +
 +    }
 +
 +    // -- HELPER
 +
 +    private void fork(final AsyncContext asyncContext, final SseChannel eventStream) {
 +
 +        val response = asyncContext.getResponse();
 +        val marshaller = new JaxbAdapters.MarkupAdapter();
 +
 +        eventStream.listenWhile(source->{
 +
 +            if(threadPool.isShutdown()) {
 +                return false; // stop listening
 +            }
 +
 +            try {
 +
 +                val writer = response.getWriter(); // don't close the writer, its likely to be reused
 +                if(writer==null) {
 +                    return false; // stop listening
 +                }
 +
 +                val payload = marshaller.marshal(ListeningMarkup.valueOfHtml(source.getPayload()));
 +
 +                writer
 +                .append("data: ")
 +                .append(payload)
 +                .append("\n\n")
 +                .flush();
 +
 +                return true; // continue listening                
 +
 +            } catch (Exception e) {
 +                e.printStackTrace();
 +                return false; // stop listening
 +            }
 +
 +        });
 +
 +        // now we wait until the eventStream closes
 +        try {
 +            eventStream.awaitClose();
 +        } catch (InterruptedException e) {
 +            e.printStackTrace();
 +        }
 +
 +        // Completes the asynchronous operation that was started on the request
 +        // that was used to initialize this AsyncContext. 
 +        asyncContext.complete();
 +
 +    }
 +
 +    private Optional<Class<?>> parseEventStreamType(HttpServletRequest request) {
 +        val eventStreamId = request.getParameter("eventStream");
 +        if(_Strings.isNullOrEmpty(eventStreamId)) {
 +            return Optional.empty();
 +        }
 +        try {
 +            return Optional.of(_Context.loadClass(eventStreamId));
 +        } catch (Throwable e) {
 +            e.printStackTrace();
 +            return Optional.empty();
 +        }
 +    }
 +
 +}
diff --cc viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 63913b1,0000000..04ee46e
mode 100644,000000..100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@@ -1,128 -1,0 +1,142 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *        http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +package org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.webmodule;
 +
 +import javax.inject.Inject;
 +import javax.inject.Named;
 +import javax.servlet.ServletContext;
 +import javax.servlet.ServletContextListener;
 +import javax.servlet.ServletException;
 +
++import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
++import org.jboss.resteasy.spi.ResteasyProviderFactory;
 +import org.springframework.beans.factory.annotation.Qualifier;
 +import org.springframework.core.annotation.Order;
 +import org.springframework.stereotype.Service;
 +
 +import org.apache.isis.applib.annotation.OrderPrecedence;
 +import org.apache.isis.applib.services.inject.ServiceInjector;
 +import org.apache.isis.core.commons.collections.Can;
 +import org.apache.isis.core.config.RestEasyConfiguration;
 +import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
 +import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
 +import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
 +import org.apache.isis.webapp.modules.WebModuleAbstract;
 +import org.apache.isis.webapp.modules.WebModuleContext;
 +
 +import lombok.Getter;
 +
 +/**
 + * WebModule that provides the RestfulObjects Viewer.
 + * 
 + * @since 2.0
++ *
++ * @implNote CDI feels responsible to resolve injection points for any Servlet or Filter
++ * we register programmatically on the ServletContext.
++ * As long as injection points are considered to be resolved by Spring, we can workaround this fact:
++ * By replacing annotations {@code @Inject} with {@code @Autowire} for any Servlet or Filter,
++ * that get contributed by a WebModule, these will be ignored by CDI.
++ *
 + */
 +@Service
 +@Named("isisRoViewer.WebModuleJaxrsRestEasy4")
 +@Order(OrderPrecedence.MIDPOINT - 80)
 +@Qualifier("JaxrsRestEasy4")
 +public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
 +
 +    private static final String ISIS_SESSION_FILTER_FOR_RESTFUL_OBJECTS = "IsisSessionFilterForRestfulObjects";
 +    private static final String ISIS_TRANSACTION_FILTER = "IsisTransactionFilterForRestfulObjects";
 +
 +    private final RestEasyConfiguration restEasyConfiguration;
 +
 +    private final String restfulPath;
 +    private final String urlPattern;
 +
 +    @Inject
 +    public WebModuleJaxrsResteasy4(
 +            final RestEasyConfiguration restEasyConfiguration,
 +            final ServiceInjector serviceInjector) {
 +        super(serviceInjector);
 +        this.restEasyConfiguration = restEasyConfiguration;
 +        this.restfulPath = this.restEasyConfiguration.getJaxrs().getDefaultPath() + "/";
 +        this.urlPattern = this.restfulPath + "*";
 +    }
 +
 +    @Getter
 +    private final String name = "JaxrsRestEasy4";
 +
 +    @Override
 +    public void prepare(WebModuleContext ctx) {
++
++        // forces RuntimeDelegate.getInstance() to be provided by RestEasy
++        // (and not by eg. the JEE container if any)
++        ResteasyProviderFactory.setInstance(new ResteasyProviderFactoryImpl());
++
 +        super.prepare(ctx);
 +
 +        if(!isApplicable(ctx)) {
 +            return;
 +        }
 +
 +        ctx.addViewer("restfulobjects");
 +        ctx.addProtectedPath(urlPattern);
 +    }
 +
 +    @Override
 +    public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
 +
 +        registerFilter(ctx, ISIS_SESSION_FILTER_FOR_RESTFUL_OBJECTS, IsisRestfulObjectsSessionFilter.class)
 +                .ifPresent(filterReg -> {
 +                    // this is mapped to the entire application;
 +                    // however the IsisSessionFilter will
 +                    // "notice" if the session filter has already been
 +                    // executed for the request pipeline, and if so will do nothing
 +                    filterReg.addMappingForUrlPatterns(
 +                            null,
 +                            true,
 +                            this.urlPattern);
 +
 +                    filterReg.setInitParameter(
 +                            "authenticationSessionStrategy",
 +                            AuthenticationSessionStrategyBasicAuth.class.getName());
 +                    filterReg.setInitParameter(
 +                            "whenNoSession", // what to do if no session was found ...
 +                            "auto"); // ... 401 and a basic authentication challenge if request originates from web browser
 +                    filterReg.setInitParameter(
 +                            "passThru",
 +                            String.join(",",
 +                                    this.restfulPath + "swagger",
 +                                    this.restfulPath + "health"));
 +
 +                } );
 +
 +        registerFilter(ctx, ISIS_TRANSACTION_FILTER, IsisTransactionFilterForRestfulObjects.class)
 +            .ifPresent(filterReg -> {
 +                filterReg.addMappingForUrlPatterns(
 +                        null,
 +                        true,
 +                        this.urlPattern);
 +            });
 +
 +
 +        return Can.empty(); // registers no listeners
 +    }
 +
 +
 +}
diff --cc viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index 5fdf4bf,0000000..d0575e4
mode 100644,000000..100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@@ -1,435 -1,0 +1,435 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *        http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +
 +package org.apache.isis.viewer.restfulobjects.viewer.webmodule;
 +
 +import java.io.IOException;
 +import java.util.Arrays;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.List;
 +import java.util.function.Function;
 +import java.util.regex.Pattern;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import javax.inject.Inject;
 +import javax.servlet.Filter;
 +import javax.servlet.FilterChain;
 +import javax.servlet.FilterConfig;
 +import javax.servlet.ServletException;
 +import javax.servlet.ServletRequest;
 +import javax.servlet.ServletResponse;
 +import javax.servlet.http.HttpServletRequest;
 +import javax.servlet.http.HttpServletResponse;
 +
++import org.springframework.beans.factory.annotation.Autowired;
++
 +import org.apache.isis.core.commons.internal.base._Strings;
 +import org.apache.isis.core.commons.internal.collections._Lists;
 +import org.apache.isis.core.commons.internal.factory.InstanceUtil;
 +import org.apache.isis.core.metamodel.commons.StringExtensions;
 +import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 +import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
 +import org.apache.isis.runtime.session.IsisSessionFactory;
 +import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
 +import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
 +import org.apache.isis.webapp.modules.templresources.TemplateResourceCachingFilter;
 +
 +import static org.apache.isis.core.commons.internal.base._With.requires;
 +
 +import lombok.val;
 +
 +/**
 + * Filter for RestfulObjects.
 + * 
 + * authenticate user, set up an Isis session
 + */
 +//@WebFilter(
 +//        servletNames={"RestfulObjectsRestEasyDispatcher"}, // this is mapped to the entire application; 
 +//            // however the IsisSessionFilter will 
 +//            // "notice" if the session filter has already been
 +//            // executed for the request pipeline, and if so will do nothing
 +//        initParams={
 +//        @WebInitParam(
 +//                name="authenticationSessionStrategy", 
 +//                value="org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth"), // authentication required for REST
 +//        @WebInitParam(
 +//                name="whenNoSession", // what to do if no session was found ...
 +//                value="auto"), // ... 401 and a basic authentication challenge if request originates from web browser
 +//        @WebInitParam(name="passThru", value="/restful/swagger,/restful/health") //TODO[ISIS-1895] the restful path is configured elsewhere
 +//})
 +public class IsisRestfulObjectsSessionFilter implements Filter {
 +
 +    /**
 +     * Recommended standard init parameter key for filters and servlets to
 +     * lookup an implementation of {@link AuthenticationSessionStrategy}.
 +     */
 +    public static final String AUTHENTICATION_SESSION_STRATEGY_KEY = "authenticationSessionStrategy";
 +
 +    /**
 +     * Default value for {@link #AUTHENTICATION_SESSION_STRATEGY_KEY} if not specified.
 +     */
 +    public static final String AUTHENTICATION_SESSION_STRATEGY_DEFAULT = AuthenticationSessionStrategyDefault.class.getName();
 +
 +    /**
 +     * Init parameter key for backward compatibility; if logonPage set then
 +     * assume 'restricted' handling.
 +     */
 +    public static final String LOGON_PAGE_KEY = "logonPage";
 +
 +
 +    /**
 +     * Init parameter key for what should be done if no session was found.
 +     *
 +     * <p>
 +     * Valid values are:
 +     * <ul>
 +     * <li>unauthorized - issue a 401 response.
 +     * <li>basicAuthChallenge - issue a basic auth 401 challenge. The idea here
 +     * is that the configured logon strategy should handle the next request
 +     * <li>restricted - allow access but only to a restricted (comma-separated)
 +     * list of paths. Access elsewhere should be redirected to the first of
 +     * these paths
 +     * <li>continue - allow the request to continue (eg if there is no security
 +     * requirements)
 +     * </ul>
 +     */
 +    public static final String WHEN_NO_SESSION_KEY = "whenNoSession";
 +
 +    /**
 +     * Which URLs to ignore (eg <code>/restful/swagger</code> so that swagger specs can be accessed from the swagger-ui)
 +     */
 +    public static final String PASS_THRU_KEY = "passThru";
 +
 +    /**
 +     * Init parameter key to read the restricted list of paths (if
 +     * {@link #WHEN_NO_SESSION_KEY} is for {@link WhenNoSession#RESTRICTED}).
 +     *
 +     * <p>
 +     * The servlets mapped to these paths are expected to be able to deal with
 +     * there being no session. Typically they will be logon pages.
 +     */
 +    public static final String RESTRICTED_KEY = "restricted";
 +
 +    /**
 +     * Init parameter key to redirect to if an exception occurs.
 +     */
 +    public static final String REDIRECT_TO_ON_EXCEPTION_KEY = "redirectToOnException";
 +
 +    /**
 +     * Init parameter key for which extensions should be ignored (typically,
 +     * mappings for other viewers within the webapp context).
 +     *
 +     * <p>
 +     * It can also be used to specify ignored static resources (though putting
 +     * the {@link TemplateResourceCachingFilter} first in the <tt>web.xml</tt>
 +     * accomplishes the same thing).
 +     *
 +     * <p>
 +     * The value is expected as a comma separated list.
 +     */
 +    public static final String IGNORE_EXTENSIONS_KEY = "ignoreExtensions";
 +    /**
 +     * Somewhat hacky, add this to the query
 +     */
 +    public static final String ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT = "__isis_force_logout";
 +
 +    private static final Function<String, Pattern> STRING_TO_PATTERN = (final String input) -> {
 +        return Pattern.compile(".*\\." + input);
 +    };
 +
-     @Inject
-     private IsisSessionFactory isisSessionFactory;
-     @Inject
-     private SpecificationLoader specificationLoader;
++    @Autowired private IsisSessionFactory isisSessionFactory;
++    @Autowired private SpecificationLoader specificationLoader;
 +    
 +    private List<String> passThruList = Collections.emptyList();
 +
 +    static void redirect(final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final String redirectTo) throws IOException {
 +        httpResponse.sendRedirect(StringExtensions.combinePath(httpRequest.getContextPath(), redirectTo));
 +    }
 +
 +    public enum WhenNoSession {
 +        UNAUTHORIZED("unauthorized") {
 +            @Override
 +            public void handle(final IsisRestfulObjectsSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
 +                httpResponse.sendError(401);
 +            }
 +        },
 +        BASIC_AUTH_CHALLENGE("basicAuthChallenge") {
 +            @Override
 +            public void handle(final IsisRestfulObjectsSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
 +                httpResponse.setHeader("WWW-Authenticate", "Basic realm=\"Apache Isis\"");
 +                httpResponse.sendError(401);
 +            }
 +        },
 +        AUTO("auto") {
 +            @Override
 +            public void handle(final IsisRestfulObjectsSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
 +                if(fromWebBrowser(httpRequest)) {
 +                    httpResponse.setHeader("WWW-Authenticate", "Basic realm=\"Apache Isis\"");
 +                }
 +                httpResponse.sendError(401);
 +            }
 +
 +            private boolean fromWebBrowser(final HttpServletRequest httpRequest) {
 +                String accept = httpRequest.getHeader("Accept");
 +                return accept.contains("text/html");
 +            }
 +        },
 +        /**
 +         * the destination servlet is expected to know that there will be no open session, and handle the case appropriately
 +         */
 +        CONTINUE("continue") {
 +            @Override
 +            public void handle(final IsisRestfulObjectsSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
 +                chain.doFilter(httpRequest, httpResponse);
 +            }
 +        },
 +        /**
 +         * Allow access to a restricted list of URLs (else redirect to the first of that list of URLs)
 +         */
 +        RESTRICTED("restricted") {
 +            @Override
 +            public void handle(final IsisRestfulObjectsSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
 +
 +                if (filter.restrictedPaths.contains(httpRequest.getServletPath())) {
 +                    chain.doFilter(httpRequest, httpResponse);
 +                    return;
 +                }
 +                redirect(httpRequest, httpResponse, filter.restrictedPaths.get(0));
 +            }
 +
 +        };
 +        private final String initParamValue;
 +
 +        private WhenNoSession(final String initParamValue) {
 +            this.initParamValue = initParamValue;
 +        }
 +
 +        public static WhenNoSession lookup(final String whenNoSessionStr) {
 +            for (final WhenNoSession wns : values()) {
 +                if (wns.initParamValue.equals(whenNoSessionStr)) {
 +                    return wns;
 +                }
 +            }
 +            throw new IllegalStateException("require an init-param of '" + WHEN_NO_SESSION_KEY + "', taking a value of " + WhenNoSession.values());
 +        }
 +
 +        public abstract void handle(IsisRestfulObjectsSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException;
 +    }
 +
 +
 +    private AuthenticationSessionStrategy authSessionStrategy;
 +    private List<String> restrictedPaths;
 +    private WhenNoSession whenNotAuthenticated;
 +    private String redirectToOnException;
 +    private Collection<Pattern> ignoreExtensions;
 +
 +
 +    
 +
 +    // /////////////////////////////////////////////////////////////////
 +    // init, destroy
 +    // /////////////////////////////////////////////////////////////////
 +
 +    @Override
 +    public void init(final FilterConfig config) throws ServletException {
 +        authSessionStrategy = lookup(config.getInitParameter(AUTHENTICATION_SESSION_STRATEGY_KEY));
 +        lookupWhenNoSession(config);
 +        lookupPassThru(config);
 +        lookupRedirectToOnException(config);
 +        lookupIgnoreExtensions(config);
 +    }
 +
 +    /**
 +     * Public visibility so can also be used by servlets.
 +     */
 +    public static AuthenticationSessionStrategy lookup(String authLookupStrategyClassName) {
 +        if (authLookupStrategyClassName == null) {
 +            authLookupStrategyClassName = AUTHENTICATION_SESSION_STRATEGY_DEFAULT;
 +        }
 +        return (AuthenticationSessionStrategy) InstanceUtil.createInstance(authLookupStrategyClassName);
 +    }
 +
 +    private void lookupWhenNoSession(final FilterConfig config) {
 +
 +        final String whenNoSessionStr = config.getInitParameter(WHEN_NO_SESSION_KEY);
 +
 +        // backward compatibility
 +        final String logonPage = config.getInitParameter(LOGON_PAGE_KEY);
 +        if (logonPage != null) {
 +            if (whenNoSessionStr != null) {
 +                throw new IllegalStateException(String.format(
 +                        "The init-param '%s' is only provided for backwards compatibility; "
 +                                + "remove if the init-param '%s' has been specified", LOGON_PAGE_KEY, WHEN_NO_SESSION_KEY));
 +            } else {
 +                // default whenNotAuthenticated and allow access through to the logonPage
 +                whenNotAuthenticated = WhenNoSession.RESTRICTED;
 +                this.restrictedPaths = _Lists.of(logonPage);
 +                return;
 +            }
 +        }
 +
 +        whenNotAuthenticated = WhenNoSession.lookup(whenNoSessionStr);
 +        if (whenNotAuthenticated == WhenNoSession.RESTRICTED) {
 +            final String restrictedPathsStr = config.getInitParameter(RESTRICTED_KEY);
 +            if (restrictedPathsStr == null) {
 +                throw new IllegalStateException(String.format("Require an init-param of '%s' key to be set.", RESTRICTED_KEY));
 +            }
 +            this.restrictedPaths = 
 +                    _Strings.splitThenStream(restrictedPathsStr, ",")
 +                    .collect(Collectors.toList());
 +
 +        }
 +
 +    }
 +
 +    void lookupPassThru(final FilterConfig config) {
 +        this.passThruList = lookupAndParsePassThru(config);
 +    }
 +
 +    List<String> lookupAndParsePassThru(final FilterConfig config) {
 +        final String passThru = config.getInitParameter(PASS_THRU_KEY);
 +        return passThru != null && !passThru.equals("")
 +                ? Arrays.asList(passThru.split(","))
 +                        : Collections.<String>emptyList();
 +    }
 +
 +    private void lookupRedirectToOnException(final FilterConfig config) {
 +        redirectToOnException = config.getInitParameter(REDIRECT_TO_ON_EXCEPTION_KEY);
 +    }
 +
 +    private void lookupIgnoreExtensions(final FilterConfig config) {
 +        ignoreExtensions = Collections.unmodifiableCollection(parseIgnorePatterns(config)
 +                .collect(Collectors.toList()));
 +    }
 +
 +    private Stream<Pattern> parseIgnorePatterns(final FilterConfig config) {
 +        final String ignoreExtensionsStr = config.getInitParameter(IGNORE_EXTENSIONS_KEY);
 +        if (ignoreExtensionsStr != null) {
 +            final Stream<String> ignoreExtensions = _Strings.splitThenStream(ignoreExtensionsStr, ","); 
 +            return ignoreExtensions.map(STRING_TO_PATTERN);
 +        }
 +        return Stream.empty();
 +    }
 +
 +
 +    @Override
 +    public void destroy() {
 +    }
 +
 +    // /////////////////////////////////////////////////////////////////
 +    // doFilter
 +    // /////////////////////////////////////////////////////////////////
 +
 +    @Override
 +    public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
 +
 +        requires(isisSessionFactory, "isisSessionFactory");
 +        requires(specificationLoader, "specificationLoader");
 +        
 +        ensureMetamodelIsValid(specificationLoader);
 +
 +        val httpServletRequest = (HttpServletRequest) request;
 +        val httpServletResponse = (HttpServletResponse) response;
 +
 +        try {
 +            val queryString = httpServletRequest.getQueryString();
 +            if (queryString != null && queryString
 +                    .contains(ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT)) {
 +
 +                authSessionStrategy.invalidate(httpServletRequest, httpServletResponse);
 +                return;
 +            }
 +
 +            if (requestIsIgnoreExtension(this, httpServletRequest) ||
 +                    TemplateResourceCachingFilter.isCachedResource(httpServletRequest)) {
 +                chain.doFilter(request, response);
 +                return;
 +            }
 +
 +            if(requestIsPassThru(httpServletRequest)) {
 +                chain.doFilter(request, response);
 +                return;
 +            }
 +            
 +            // authenticate
 +            val authenticationSession =
 +                    authSessionStrategy.lookupValid(httpServletRequest, httpServletResponse);
 +            if (authenticationSession != null) {
 +               
 +                authSessionStrategy.bind(httpServletRequest, httpServletResponse, authenticationSession);
 +
 +                isisSessionFactory.openSession(authenticationSession);
 +                chain.doFilter(request, response);
 +                
 +                return;
 +            }
 +
 +            try {
 +                whenNotAuthenticated.handle(this, httpServletRequest, httpServletResponse, chain);
 +            } catch (final RuntimeException | IOException | ServletException ex) {
 +                // in case the destination servlet cannot cope, but we've
 +                // been told to redirect elsewhere
 +                if (redirectToOnException != null) {
 +                    redirect(httpServletRequest, httpServletResponse, redirectToOnException);
 +                    return;
 +                }
 +                throw ex;
 +            }
 +
 +        } finally {
 +            isisSessionFactory.closeSession();
 +        }
 +
 +    }
 +
 +
 +    private static void ensureMetamodelIsValid(SpecificationLoader specificationLoader) {
 +        val validationResult = specificationLoader.getValidationResult();
 +        if(validationResult.hasFailures()) {
 +            throw new MetaModelInvalidException(validationResult.getAsLineNumberedString());
 +        }
 +    }
 +
 +
 +    protected boolean requestIsPassThru(final HttpServletRequest httpServletRequest) {
 +        final String requestURI = httpServletRequest.getRequestURI();
 +        for (final String passThru : passThruList) {
 +            if(requestURI.startsWith(passThru)) {
 +                return true;
 +            }
 +        }
 +        return false;
 +    }
 +
 +    private boolean requestIsIgnoreExtension(
 +            final IsisRestfulObjectsSessionFilter filter, 
 +            final HttpServletRequest httpRequest) {
 +        
 +        val servletPath = httpRequest.getServletPath();
 +        for (final Pattern extension : filter.ignoreExtensions) {
 +            if (extension.matcher(servletPath).matches()) {
 +                return true;
 +            }
 +        }
 +        return false;
 +    }
 +
 +}


[isis] 12/21: ISIS-2259: moves core/testsupport/unittestsupport up one level

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

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

commit 98a59ccf4cf88e9f793d51c277c3b9528c97d8c2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:55:45 2020 +0000

    ISIS-2259: moves core/testsupport/unittestsupport up one level
---
 core/pom.xml                                                            | 2 +-
 core/{testsupport => }/unittestsupport/.gitignore                       | 0
 core/{testsupport => }/unittestsupport/pom.xml                          | 1 -
 core/{testsupport => }/unittestsupport/src/main/doc/antora.yml          | 0
 .../unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc     | 0
 .../src/main/doc/modules/unit-test-support/pages/about.adoc             | 0
 .../unit-test-support/pages/unit-test-support/contract-tests.adoc       | 0
 .../unit-test-support/pages/unit-test-support/jmock-extensions.adoc     | 0
 .../unit-test-support/pages/unit-test-support/maven-configuration.adoc  | 0
 .../pages/unit-test-support/soap-fake-server-junit-rule.adoc            | 0
 .../src/main/doc/modules/unit-test-support/partials/module-nav.adoc     | 0
 .../org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java | 0
 .../bidir/BidirectionalRelationshipContractTestAbstract.java            | 0
 .../src/main/java/org/apache/isis/unittestsupport/bidir/Child.java      | 0
 .../main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java   | 0
 .../java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java     | 0
 .../java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java  | 0
 .../main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java  | 0
 .../src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java     | 0
 .../unittestsupport/comparable/ComparableContractTest_compareTo.java    | 0
 .../isis/unittestsupport/comparable/ComparableContractTester.java       | 0
 .../org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java | 0
 .../java/org/apache/isis/unittestsupport/config/internal/_Config.java   | 0
 .../apache/isis/unittestsupport/config/internal/_Config_Instance.java   | 0
 .../isis/unittestsupport/config/internal/_Config_LifecycleResource.java | 0
 .../apache/isis/unittestsupport/config/internal/_Config_Parsers.java    | 0
 .../org/apache/isis/unittestsupport/config/internal/_Config_trim.java   | 0
 .../src/main/java/org/apache/isis/unittestsupport/files/Files.java      | 0
 .../inject/InjectServiceMethodMustBeFinalContractTestAbstract.java      | 0
 .../main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java    | 0
 .../isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java   | 0
 .../java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java    | 0
 .../org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java | 0
 .../main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java | 0
 .../java/org/apache/isis/unittestsupport/jmocking/JMockActions.java     | 0
 .../org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java     | 0
 .../java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java     | 0
 .../java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java  | 0
 .../java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java   | 0
 .../main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java    | 0
 .../apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java    | 0
 .../java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java     | 0
 .../isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java | 0
 .../java/org/apache/isis/unittestsupport/streams/NullPrintStream.java   | 0
 .../main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java   | 0
 .../main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java  | 0
 .../main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java   | 0
 .../main/java/org/apache/isis/unittestsupport/utils/StringUtils.java    | 0
 .../isis/unittestsupport/value/ValueTypeContractTestAbstract.java       | 0
 49 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d75ac69..3b469a7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1849,7 +1849,7 @@
 		<module>webapp</module>
 		<module>webboot-springboot</module>
 
-		<module>testsupport/unittestsupport</module>
+		<module>unittestsupport</module>
 
 		<module>security</module>
 		<module>../security/bypass</module>
diff --git a/core/testsupport/unittestsupport/.gitignore b/core/unittestsupport/.gitignore
similarity index 100%
rename from core/testsupport/unittestsupport/.gitignore
rename to core/unittestsupport/.gitignore
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
similarity index 99%
rename from core/testsupport/unittestsupport/pom.xml
rename to core/unittestsupport/pom.xml
index 0b3a287..3946926 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -18,7 +18,6 @@
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/testsupport/unittestsupport/src/main/doc/antora.yml b/core/unittestsupport/src/main/doc/antora.yml
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/antora.yml
rename to core/unittestsupport/src/main/doc/antora.yml
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
rename to core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
similarity index 100%
rename from core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java


[isis] 07/21: ISIS-2259: moves core/persistence up a level.

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

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

commit 2dbdf0c820b4117bd1396d663209d1789e59ed22
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:28:55 2020 +0000

    ISIS-2259: moves core/persistence up a level.
---
 core/pom.xml                                                |   2 +-
 {core/persistence => persistence}/jdo/applib/pom.xml        |   0
 .../isis/persistence/jdo/applib/IsisModuleJdoApplib.java    |   0
 .../jdo/applib/exceptions/NotPersistableException.java      |   0
 .../jdo/applib/exceptions/UnsupportedFindException.java     |   0
 .../jdo/applib/fixturestate/FixturesInstalledFlag.java      |   0
 .../jdo/applib/fixturestate/FixturesInstalledState.java     |   0
 .../applib/fixturestate/FixturesInstalledStateHolder.java   |   0
 .../persistence/jdo/applib/fixturestate/package-info.java   |   0
 .../persistence/jdo/applib/services/IsisJdoSupport.java     |   0
 .../jdo/applib/services/IsisJdoSupport_v3_2.java            |   0
 {core/persistence => persistence}/jdo/datanucleus-5/pom.xml |   0
 .../jdo/datanucleus5/IsisModuleJdoDataNucleus5.java         |   0
 .../datanucleus/CreateSchemaObjectFromClassMetadata.java    |   0
 .../datanucleus5/datanucleus/DataNucleusContextUtil.java    |   0
 .../jdo/datanucleus5/datanucleus/DataNucleusException.java  |   0
 .../datanucleus/DataNucleusLifeCycleHelper.java             |   0
 .../datanucleus/DataNucleusPropertiesAware.java             |   0
 .../jdo/datanucleus5/datanucleus/DataNucleusSettings.java   |   0
 .../datanucleus5/datanucleus/JDOStateManagerForIsis.java    |   0
 .../jdo/datanucleus5/datanucleus/JdoRuntimeException.java   |   0
 .../datanucleus/metamodel/JdoPropertyUtils.java             |   0
 .../commands/AbstractDataNucleusObjectCommand.java          |   0
 .../commands/DataNucleusCreateObjectCommand.java            |   0
 .../commands/DataNucleusDeleteObjectCommand.java            |   0
 .../queries/PersistenceQueryFindAllInstancesProcessor.java  |   0
 .../PersistenceQueryFindUsingApplibQueryProcessor.java      |   0
 .../persistence/queries/PersistenceQueryProcessor.java      |   0
 .../queries/PersistenceQueryProcessorAbstract.java          |   0
 .../datanucleus/persistence/queries/QueryUtil.java          |   0
 .../datanucleus/persistence/spi/JdoObjectIdSerializer.java  |   0
 .../datanucleus/service/JdoPersistenceLifecycleService.java |   0
 .../datanucleus/service/eventbus/EventBusServiceJdo.java    |   0
 .../datanucleus/typeconverters/IsisMarkupConverter.java     |   0
 .../datanucleus/typeconverters/IsisPasswordConverter.java   |   0
 .../valuemappings/ByteArrayBlobRdbmsMapping.java            |   0
 .../datanucleus/valuetypes/IsisBlobMapping.java             |   0
 .../datanucleus/valuetypes/IsisClobMapping.java             |   0
 .../jdo/datanucleus5/entities/JdoEntityTypeRegistry.java    |   0
 .../ExceptionRecognizerCompositeForJdoObjectStore.java      |   0
 .../ExceptionRecognizerForJDODataStoreException.java        |   0
 ...grityConstraintViolationForeignKeyNoActionException.java |   0
 .../ExceptionRecognizerForJDOObjectNotFoundException.java   |   0
 ...LIntegrityConstraintViolationUniqueOrIndexException.java |   0
 .../datanucleus5/exceprecog/JdoNestedExceptionResolver.java |   0
 .../jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java      |   0
 .../jdosupport/mixins/Persistable_datanucleusIdLong.java    |   0
 .../mixins/Persistable_datanucleusVersionLong.java          |   0
 .../mixins/Persistable_datanucleusVersionTimestamp.java     |   0
 .../jdosupport/mixins/Persistable_downloadJdoMetadata.java  |   0
 .../lifecycles/JdoStoreLifecycleListenerForIsis.java        |   0
 .../jdo/datanucleus5/metamodel/JdoMetamodelUtil.java        |   0
 .../datanucleus5/metamodel/JdoProgrammingModelPlugin.java   |   0
 .../JdoDatastoreIdentityAnnotationFacetFactory.java         |   0
 .../object/datastoreidentity/JdoDatastoreIdentityFacet.java |   0
 .../JdoDatastoreIdentityFacetAbstract.java                  |   0
 .../JdoDatastoreIdentityFacetAnnotation.java                |   0
 .../datastoreidentity/JdoDatastoreIdentityFacetImpl.java    |   0
 .../facets/object/datastoreidentity/package-info.java       |   0
 .../JdoDiscriminatorAnnotationFacetFactory.java             |   0
 .../facets/object/discriminator/JdoDiscriminatorFacet.java  |   0
 .../object/discriminator/JdoDiscriminatorFacetDefault.java  |   0
 ...cIdFacetInferredFromJdoDiscriminatorValueAnnotation.java |   0
 .../metamodel/facets/object/discriminator/package-info.java |   0
 ...ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java |   0
 .../JdoPersistenceCapableAnnotationFacetFactory.java        |   0
 .../persistencecapable/JdoPersistenceCapableFacet.java      |   0
 .../JdoPersistenceCapableFacetAbstract.java                 |   0
 .../JdoPersistenceCapableFacetAnnotation.java               |   0
 .../persistencecapable/JdoPersistenceCapableFacetImpl.java  |   0
 .../facets/object/persistencecapable/package-info.java      |   0
 .../metamodel/facets/object/query/JdoNamedQuery.java        |   0
 .../facets/object/query/JdoQueriesFacetAnnotation.java      |   0
 .../facets/object/query/JdoQueryAnnotationFacetFactory.java |   0
 .../metamodel/facets/object/query/JdoQueryFacet.java        |   0
 .../facets/object/query/JdoQueryFacetAbstract.java          |   0
 .../facets/object/query/JdoQueryFacetAnnotation.java        |   0
 .../facets/object/query/VisitorForClauseAbstract.java       |   0
 .../metamodel/facets/object/query/VisitorForFromClause.java |   0
 .../facets/object/query/VisitorForVariablesClause.java      |   0
 .../object/version/JdoVersionAnnotationFacetFactory.java    |   0
 .../metamodel/facets/object/version/JdoVersionFacet.java    |   0
 .../object/version/JdoVersionFacetFromAnnotation.java       |   0
 .../metamodel/facets/object/version/package-info.java       |   0
 ...igDecimalDerivedFromJdoColumnAnnotationFacetFactory.java |   0
 .../prop/column/BigDecimalFacetDerivedFromJdoColumn.java    |   0
 .../facets/prop/column/BigDecimalFacetFallback.java         |   0
 .../prop/column/MandatoryFacetDerivedFromJdoColumn.java     |   0
 .../MandatoryFacetInferredFromAbsenceOfJdoColumn.java       |   0
 .../MandatoryFromJdoColumnAnnotationFacetFactory.java       |   0
 ...MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java |   0
 .../prop/column/MaxLengthFacetDerivedFromJdoColumn.java     |   0
 .../JdoNotPersistentAnnotationFacetFactory.java             |   0
 .../facets/prop/notpersistent/JdoNotPersistentFacet.java    |   0
 .../prop/notpersistent/JdoNotPersistentFacetAbstract.java   |   0
 .../prop/notpersistent/JdoNotPersistentFacetAnnotation.java |   0
 .../prop/notpersistent/JdoNotPersistentFacetImpl.java       |   0
 ...PersistedFacetDerivedFromJdoNotPersistentAnnotation.java |   0
 .../DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java    |   0
 .../primarykey/JdoPrimaryKeyAnnotationFacetFactory.java     |   0
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java          |   0
 .../facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java  |   0
 .../prop/primarykey/JdoPrimaryKeyFacetAnnotation.java       |   0
 .../facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java      |   0
 .../OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java    |   0
 .../metamodel/facets/prop/primarykey/package-info.java      |   0
 .../metamodel/util/JdoPrimaryKeyPropertyPredicate.java      |   0
 .../jdo/datanucleus5/metrics/MetricsServiceDefault.java     |   0
 .../datanucleus5/objectadapter/ObjectAdapterContext.java    |   0
 .../ObjectAdapterContext_DependencyInjection.java           |   0
 .../objectadapter/ObjectAdapterContext_Factories.java       |   0
 .../ObjectAdapterContext_LifecycleEventSupport.java         |   0
 .../objectadapter/ObjectAdapterContext_NewIdentifier.java   |   0
 .../ObjectAdapterContext_ObjectAdapterByIdProvider.java     |   0
 .../ObjectAdapterContext_ObjectAdapterProvider.java         |   0
 .../objectadapter/ObjectAdapterContext_ObjectCreation.java  |   0
 .../jdo/datanucleus5/persistence/DNStoreManagerType.java    |   0
 .../persistence/DataNucleusApplicationComponents5.java      |   0
 .../jdo/datanucleus5/persistence/IsisLifecycleListener.java |   0
 .../datanucleus5/persistence/IsisPersistenceSessionJdo.java |   0
 .../persistence/IsisPersistenceSessionJdoBase.java          |   0
 .../persistence/IsisPlatformTransactionManagerForJdo.java   |   0
 .../jdo/datanucleus5/persistence/IsisTransactionJdo.java    |   0
 .../datanucleus5/persistence/IsisTransactionManagerJdo.java |   0
 .../jdo/datanucleus5/persistence/PersistenceSession5.java   |   0
 .../persistence/PersistenceSessionFactory5.java             |   0
 .../persistence/jdo/datanucleus5/persistence/Utils.java     |   0
 .../persistence/command/CreateObjectCommand.java            |   0
 .../persistence/command/DestroyObjectCommand.java           |   0
 .../persistence/command/PersistenceCommand.java             |   0
 .../persistence/command/PersistenceCommandAbstract.java     |   0
 .../datanucleus5/persistence/query/PersistenceQuery.java    |   0
 .../persistence/query/PersistenceQueryAbstract.java         |   0
 .../persistence/query/PersistenceQueryFactory.java          |   0
 .../persistence/query/PersistenceQueryFindAllInstances.java |   0
 .../query/PersistenceQueryFindUsingApplibQueryDefault.java  |   0
 .../datanucleus-5/src/main/resources/META-INF/MANIFEST.MF   |   0
 .../jdo/datanucleus-5/src/main/resources/plugin.xml         |   0
 .../specloader/ObjectReflectorDefaultTest_object.java       |   0
 .../ExceptionRecognizerCompositeForJdoObjectStoreTest.java  |   0
 ...izerForSQLIntegrityConstraintViolationExceptionTest.java |   0
 ...GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java |   0
 .../GivenJdoDiscriminatorAnnotationFacetFactoryTest.java    |   0
 ...ivenJdoPersistenceCapableAnnotationFacetFactoryTest.java |   0
 .../object/query/JdoQueryAnnotationFacetFactoryTest.java    |   0
 .../version/JdoVersionAnnotationFacetFactoryTest.java       |   0
 ...doVersionAnnotationFacetFactoryTest_refineMetaModel.java |   0
 ...cimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java |   0
 ...atoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java |   0
 .../column/SimpleObjectWithBigDecimalColumnAnnotations.java |   0
 .../column/SimpleObjectWithColumnAllowsNullAnnotations.java |   0
 .../GivenJdoNotPersistentAnnotationFacetFactoryTest.java    |   0
 .../notpersistent/SimpleObjectWithNotPersistentColumn.java  |   0
 .../GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java       |   0
 .../facets/prop/primarykey/SimpleObjectWithPrimaryKey.java  |   0
 .../persistence/adapterfactory/pojo/PojoAdapterTest.java    |   0
 .../objectstore/transaction/PojoAdapterBuilder.java         |   0
 .../isis/runtime/system/ObjectMemberAbstractTest.java       |   0
 .../wrapper/WrapperFactoryDefault_wrappedObject_Test.java   |   0
 .../WrapperFactoryDefault_wrappedObject_transient_Test.java |   0
 {core/persistence => persistence}/jdo/pom.xml               |   2 +-
 .../persistence => persistence}/jdo/src/main/doc/antora.yml |   0
 .../ROOT/images/hints-n-tips/diagnosing-n-plus-1.png        | Bin
 .../party-agreementrole-agreement.png                       | Bin
 .../jdo/src/main/doc/modules/ROOT/nav.adoc                  |   0
 .../jdo/src/main/doc/modules/ROOT/pages/about.adoc          |   0
 .../jdo/src/main/doc/modules/ROOT/pages/configuring.adoc    |   0
 .../main/doc/modules/ROOT/pages/configuring/bulk-load.adoc  |   0
 .../configuring/disabling-persistence-by-reachability.adoc  |   0
 .../doc/modules/ROOT/pages/configuring/persistence-xml.adoc |   0
 .../main/doc/modules/ROOT/pages/configuring/properties.adoc |   0
 .../ROOT/pages/configuring/using-jndi-data-source.adoc      |   0
 .../jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc     |   0
 .../jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc |   0
 .../ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc      |   0
 .../main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc   |   0
 .../ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc     |   0
 .../pages/hints-and-tips/overriding-jdo-annotations.adoc    |   0
 .../hints-and-tips/subtype-entity-not-fully-populated.adoc  |   0
 .../hints-and-tips/typesafe-queries-and-fetchgroups.adoc    |   0
 .../jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc   |   0
 .../jdo-mappings/mandatory-properties-in-subtypes.adoc      |   0
 .../modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc  |   0
 .../jdo-mappings/one-to-m-bidirectional-relationships.adoc  |   0
 .../src/main/doc/modules/ROOT/partials/component-nav.adoc   |   0
 .../jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc  |   0
 186 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b2f20a2..e630ad8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1865,7 +1865,7 @@
 		<module>viewers/restfulobjects</module>
 		<module>viewers/wicket</module>
 
-		<module>persistence/jdo</module>
+		<module>../persistence/jdo</module>
 
 		<!-- to break cyclic dependencies some tests needed to be moved to their 
 			own modules -->
diff --git a/core/persistence/jdo/applib/pom.xml b/persistence/jdo/applib/pom.xml
similarity index 100%
rename from core/persistence/jdo/applib/pom.xml
rename to persistence/jdo/applib/pom.xml
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport_v3_2.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport_v3_2.java
similarity index 100%
rename from core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport_v3_2.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport_v3_2.java
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/pom.xml
rename to persistence/jdo/datanucleus-5/pom.xml
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/CreateSchemaObjectFromClassMetadata.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/CreateSchemaObjectFromClassMetadata.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/CreateSchemaObjectFromClassMetadata.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/CreateSchemaObjectFromClassMetadata.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusPropertiesAware.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusPropertiesAware.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusPropertiesAware.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusPropertiesAware.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JDOStateManagerForIsis.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JDOStateManagerForIsis.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JDOStateManagerForIsis.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JDOStateManagerForIsis.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JdoRuntimeException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JdoRuntimeException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JdoRuntimeException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/JdoRuntimeException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/metamodel/JdoPropertyUtils.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/metamodel/JdoPropertyUtils.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/metamodel/JdoPropertyUtils.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/metamodel/JdoPropertyUtils.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/QueryUtil.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/QueryUtil.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/QueryUtil.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/QueryUtil.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/spi/JdoObjectIdSerializer.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/spi/JdoObjectIdSerializer.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/spi/JdoObjectIdSerializer.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/eventbus/EventBusServiceJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/eventbus/EventBusServiceJdo.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/eventbus/EventBusServiceJdo.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/eventbus/EventBusServiceJdo.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisMarkupConverter.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisMarkupConverter.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisMarkupConverter.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisMarkupConverter.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisPasswordConverter.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisPasswordConverter.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisPasswordConverter.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/typeconverters/IsisPasswordConverter.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisBlobMapping.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisBlobMapping.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisBlobMapping.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisBlobMapping.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisClobMapping.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisClobMapping.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisClobMapping.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/valuetypes/IsisClobMapping.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/JdoNestedExceptionResolver.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/JdoNestedExceptionResolver.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/JdoNestedExceptionResolver.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/JdoNestedExceptionResolver.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusIdLong.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusIdLong.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusIdLong.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusIdLong.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionLong.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionLong.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionLong.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionLong.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_downloadJdoMetadata.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_downloadJdoMetadata.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_downloadJdoMetadata.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/mixins/Persistable_downloadJdoMetadata.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoMetamodelUtil.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoMetamodelUtil.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoMetamodelUtil.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoMetamodelUtil.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/package-info.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/package-info.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/package-info.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/package-info.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/package-info.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/package-info.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/package-info.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/package-info.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/package-info.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/package-info.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/package-info.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/package-info.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoNamedQuery.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoNamedQuery.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoNamedQuery.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoNamedQuery.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForClauseAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForClauseAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForClauseAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForClauseAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForFromClause.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForFromClause.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForFromClause.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForFromClause.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForVariablesClause.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForVariablesClause.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForVariablesClause.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/VisitorForVariablesClause.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/package-info.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/package-info.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/package-info.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/package-info.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetFallback.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetFallback.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetFallback.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalFacetFallback.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/package-info.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/package-info.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/package-info.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/package-info.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/util/JdoPrimaryKeyPropertyPredicate.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DNStoreManagerType.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DNStoreManagerType.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DNStoreManagerType.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DNStoreManagerType.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/Utils.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/Utils.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/Utils.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/Utils.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/CreateObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/CreateObjectCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/CreateObjectCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/CreateObjectCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/DestroyObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/DestroyObjectCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/DestroyObjectCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/DestroyObjectCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommand.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommand.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommand.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommandAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommandAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommandAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/command/PersistenceCommandAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
diff --git a/core/persistence/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF b/persistence/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
rename to persistence/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
diff --git a/core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml b/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
rename to persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
similarity index 100%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
diff --git a/core/persistence/jdo/pom.xml b/persistence/jdo/pom.xml
similarity index 96%
rename from core/persistence/jdo/pom.xml
rename to persistence/jdo/pom.xml
index 97ea3f7..509ad89 100644
--- a/core/persistence/jdo/pom.xml
+++ b/persistence/jdo/pom.xml
@@ -17,7 +17,7 @@
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-persistence-jdo</artifactId>
diff --git a/core/persistence/jdo/src/main/doc/antora.yml b/persistence/jdo/src/main/doc/antora.yml
similarity index 100%
rename from core/persistence/jdo/src/main/doc/antora.yml
rename to persistence/jdo/src/main/doc/antora.yml
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png b/persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
rename to persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
rename to persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc b/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc b/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc b/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc b/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from core/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc


[isis] 03/21: ISIS-2259: moves isis-applib and isis-schema to ../api directory

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

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

commit fde0cf35f31f237074f871ae575800a04d17767e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:03:02 2020 +0000

    ISIS-2259: moves isis-applib and isis-schema to ../api directory
---
 {core/schema => api/applib}/.gitignore                      |   0
 {core => api}/applib/pom.xml                                |   0
 {core/schema => api/applib}/src/main/doc/antora.yml         |   0
 .../applib/src/main/doc/modules/applib-ant/examples.sh      |   0
 .../doc/modules/applib-ant/examples}/annotation/Action.java |   0
 .../applib-ant/examples}/annotation/ActionLayout.java       |   0
 .../modules/applib-ant/examples}/annotation/Auditing.java   |   0
 .../applib-ant/examples}/annotation/BookmarkPolicy.java     |   0
 .../modules/applib-ant/examples}/annotation/Bounding.java   |   0
 .../modules/applib-ant/examples}/annotation/Collection.java |   0
 .../applib-ant/examples}/annotation/CollectionLayout.java   |   0
 .../applib-ant/examples}/annotation/CommandExecuteIn.java   |   0
 .../applib-ant/examples}/annotation/CommandPersistence.java |   0
 .../applib-ant/examples}/annotation/CommandReification.java |   0
 .../modules/applib-ant/examples}/annotation/Constants.java  |   0
 .../applib-ant/examples}/annotation/Contributed.java        |   0
 .../modules/applib-ant/examples/annotation/Defaulted.java   |   0
 .../applib-ant/examples}/annotation/DomainObject.java       |   0
 .../applib-ant/examples}/annotation/DomainObjectLayout.java |   0
 .../applib-ant/examples}/annotation/DomainService.java      |   0
 .../examples}/annotation/DomainServiceLayout.java           |   0
 .../modules/applib-ant/examples}/annotation/Editing.java    |   0
 .../applib-ant/examples}/annotation/EqualByContent.java     |   0
 .../doc/modules/applib-ant/examples}/annotation/Facets.java |   0
 .../modules/applib-ant/examples}/annotation/HomePage.java   |   0
 .../applib-ant/examples}/annotation/LabelPosition.java      |   0
 .../applib-ant/examples}/annotation/MemberOrder.java        |   0
 .../examples}/annotation/MementoSerialization.java          |   0
 .../modules/applib-ant/examples}/annotation/MinLength.java  |   0
 .../doc/modules/applib-ant/examples}/annotation/Mixin.java  |   0
 .../doc/modules/applib-ant/examples}/annotation/Module.java |   0
 .../doc/modules/applib-ant/examples}/annotation/Nature.java |   0
 .../applib-ant/examples}/annotation/NatureOfService.java    |   0
 .../modules/applib-ant/examples}/annotation/Navigable.java  |   0
 .../applib-ant/examples}/annotation/Optionality.java        |   0
 .../applib-ant/examples}/annotation/OrderPrecedence.java    |   0
 .../modules/applib-ant/examples}/annotation/Parameter.java  |   0
 .../applib-ant/examples}/annotation/ParameterLayout.java    |   0
 .../applib-ant/examples}/annotation/Programmatic.java       |   0
 .../modules/applib-ant/examples}/annotation/Projecting.java |   0
 .../applib-ant/examples}/annotation/PromptStyle.java        |   0
 .../modules/applib-ant/examples}/annotation/Property.java   |   0
 .../applib-ant/examples}/annotation/PropertyLayout.java     |   0
 .../modules/applib-ant/examples}/annotation/Publishing.java |   0
 .../examples}/annotation/PublishingChangeKind.java          |   0
 .../modules/applib-ant/examples}/annotation/Redirect.java   |   0
 .../modules/applib-ant/examples}/annotation/RenderDay.java  |   0
 .../modules/applib-ant/examples}/annotation/Repainting.java |   0
 .../modules/applib-ant/examples}/annotation/RestrictTo.java |   0
 .../applib-ant/examples}/annotation/SemanticsOf.java        |   0
 .../doc/modules/applib-ant/examples}/annotation/Title.java  |   0
 .../doc/modules/applib-ant/examples/annotation/Value.java   |   0
 .../modules/applib-ant/examples}/annotation/ViewModel.java  |   0
 .../applib-ant/examples}/annotation/ViewModelLayout.java    |   0
 .../doc/modules/applib-ant/examples}/annotation/Where.java  |   0
 .../applib-ant/examples}/annotation/package-info.java       |   0
 .../applib/src/main/doc/modules/applib-ant/images/.gitkeep  |   0
 .../reference-annotations/ActionLayout}/bookmarking.png     | Bin
 .../reference-annotations/ActionLayout/position-BELOW.png   | Bin
 .../reference-annotations/ActionLayout/position-PANEL.png   | Bin
 .../ActionLayout/position-PANEL_DROPDOWN.png                | Bin
 .../reference-annotations/ActionLayout/position-RIGHT.png   | Bin
 .../CollectionLayout/sortedby-dependencies.png              | Bin
 .../DomainObjectLayout/bookmarking-nested.png               | Bin
 .../DomainObjectLayout}/bookmarking.png                     | Bin
 .../DomainServiceLayout/menuBar-primary.png                 | Bin
 .../DomainServiceLayout/menuBar-secondary.png               | Bin
 .../DomainServiceLayout/menuBar-tertiary.png                | Bin
 .../reference-annotations/DomainServiceLayout/menuOrder.png | Bin
 .../images/reference-annotations/HomePage/HomePage.png      | Bin
 .../PropertyLayout/labelPosition-LEFT.png                   | Bin
 .../PropertyLayout/labelPosition-NONE.png                   | Bin
 .../PropertyLayout/labelPosition-TOP.png                    | Bin
 .../PropertyLayout/labelPosition-boolean-LEFT.png           | Bin
 .../PropertyLayout/labelPosition-boolean-RIGHT.png          | Bin
 .../applib/src/main/doc/modules/applib-ant}/nav.adoc        |   0
 .../src/main/doc/modules/applib-ant/pages/Action.adoc       |   0
 .../doc/modules/applib-ant/pages/Action/associateWith.adoc  |   0
 .../main/doc/modules/applib-ant/pages/Action/command.adoc   |   0
 .../doc/modules/applib-ant/pages/Action/domainEvent.adoc    |   0
 .../main/doc/modules/applib-ant/pages/Action/hidden.adoc    |   0
 .../main/doc/modules/applib-ant/pages/Action/invokeOn.adoc  |   0
 .../doc/modules/applib-ant/pages/Action/publishing.adoc     |   0
 .../doc/modules/applib-ant/pages/Action/restrictTo.adoc     |   0
 .../main/doc/modules/applib-ant/pages/Action/semantics.adoc |   0
 .../main/doc/modules/applib-ant/pages/Action/typeOf.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/ActionLayout.adoc |   0
 .../modules/applib-ant/pages/ActionLayout/bookmarking.adoc  |   0
 .../applib-ant/pages/ActionLayout/contributedAs.adoc        |   0
 .../doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc |   0
 .../modules/applib-ant/pages/ActionLayout/cssClassFa.adoc   |   0
 .../modules/applib-ant/pages/ActionLayout/describedAs.adoc  |   0
 .../doc/modules/applib-ant/pages/ActionLayout/hidden.adoc   |   0
 .../doc/modules/applib-ant/pages/ActionLayout/named.adoc    |   0
 .../doc/modules/applib-ant/pages/ActionLayout/position.adoc |   0
 .../modules/applib-ant/pages/ActionLayout/promptStyle.adoc  |   0
 .../doc/modules/applib-ant/pages/ActionLayout/redirect.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/Collection.adoc   |   0
 .../modules/applib-ant/pages/Collection/domainEvent.adoc    |   0
 .../doc/modules/applib-ant/pages/Collection/editing.adoc    |   0
 .../doc/modules/applib-ant/pages/Collection/hidden.adoc     |   0
 .../modules/applib-ant/pages/Collection/notPersisted.adoc   |   0
 .../doc/modules/applib-ant/pages/Collection/typeOf.adoc     |   0
 .../main/doc/modules/applib-ant/pages/CollectionLayout.adoc |   0
 .../modules/applib-ant/pages/CollectionLayout/cssClass.adoc |   0
 .../applib-ant/pages/CollectionLayout/defaultView.adoc      |   0
 .../applib-ant/pages/CollectionLayout/describedAs.adoc      |   0
 .../modules/applib-ant/pages/CollectionLayout/hidden.adoc   |   0
 .../modules/applib-ant/pages/CollectionLayout/named.adoc    |   0
 .../modules/applib-ant/pages/CollectionLayout/paged.adoc    |   0
 .../modules/applib-ant/pages/CollectionLayout/sortedBy.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/Column.adoc       |   0
 .../src/main/doc/modules/applib-ant/pages/Digits.adoc       |   0
 .../main/doc/modules/applib-ant/pages/Discriminator.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/DomainObject.adoc |   0
 .../applib-ant/pages/DomainObject/actionDomainEvent.adoc    |   0
 .../doc/modules/applib-ant/pages/DomainObject/auditing.adoc |   0
 .../pages/DomainObject/autoCompleteRepository.adoc          |   0
 .../doc/modules/applib-ant/pages/DomainObject/bounding.adoc |   0
 .../pages/DomainObject/collectionDomainEvent.adoc           |   0
 .../pages/DomainObject/createdLifecycleEvent.adoc           |   0
 .../doc/modules/applib-ant/pages/DomainObject/editing.adoc  |   0
 .../applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc |   0
 .../modules/applib-ant/pages/DomainObject/mixinMethod.adoc  |   0
 .../doc/modules/applib-ant/pages/DomainObject/nature.adoc   |   0
 .../modules/applib-ant/pages/DomainObject/objectType.adoc   |   0
 .../pages/DomainObject/persistedLifecycleEvent.adoc         |   0
 .../pages/DomainObject/persistingLifecycleEvent.adoc        |   0
 .../applib-ant/pages/DomainObject/propertyDomainEvent.adoc  |   0
 .../modules/applib-ant/pages/DomainObject/publishing.adoc   |   0
 .../pages/DomainObject/removingLifecycleEvent.adoc          |   0
 .../pages/DomainObject/updatedLifecycleEvent.adoc           |   0
 .../pages/DomainObject/updatingLifecycleEvent.adoc          |   0
 .../doc/modules/applib-ant/pages/DomainObjectLayout.adoc    |   0
 .../applib-ant/pages/DomainObjectLayout/bookmarking.adoc    |   0
 .../applib-ant/pages/DomainObjectLayout/cssClass.adoc       |   0
 .../applib-ant/pages/DomainObjectLayout/cssClassFa.adoc     |   0
 .../pages/DomainObjectLayout/cssClassUiEvent.adoc           |   0
 .../applib-ant/pages/DomainObjectLayout/describedAs.adoc    |   0
 .../applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc    |   0
 .../applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc  |   0
 .../modules/applib-ant/pages/DomainObjectLayout/named.adoc  |   0
 .../modules/applib-ant/pages/DomainObjectLayout/paged.adoc  |   0
 .../modules/applib-ant/pages/DomainObjectLayout/plural.adoc |   0
 .../applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc   |   0
 .../main/doc/modules/applib-ant/pages/DomainService.adoc    |   0
 .../doc/modules/applib-ant/pages/DomainService/nature.adoc  |   0
 .../modules/applib-ant/pages/DomainService/objectType.adoc  |   0
 .../applib-ant/pages/DomainService/repositoryFor.adoc       |   0
 .../doc/modules/applib-ant/pages/DomainServiceLayout.adoc   |   0
 .../applib-ant/pages/DomainServiceLayout/menuBar.adoc       |   0
 .../applib-ant/pages/DomainServiceLayout/menuOrder.adoc     |   0
 .../modules/applib-ant/pages/DomainServiceLayout/named.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/Facets.adoc       |   0
 .../src/main/doc/modules/applib-ant/pages/HomePage.adoc     |   0
 .../src/main/doc/modules/applib-ant/pages/Inject.adoc       |   0
 .../doc/modules/applib-ant/pages/MemberGroupLayout.adoc     |   0
 .../src/main/doc/modules/applib-ant/pages/MemberOrder.adoc  |   0
 .../main/doc/modules/applib-ant/pages/MemberOrder/name.adoc |   0
 .../doc/modules/applib-ant/pages/MemberOrder/sequence.adoc  |   0
 .../src/main/doc/modules/applib-ant/pages/MinLength.adoc    |   0
 .../applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/Mixin/method.adoc |   0
 .../main/doc/modules/applib-ant/pages/NotPersistent.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/Nullable.adoc     |   0
 .../src/main/doc/modules/applib-ant/pages/Parameter.adoc    |   0
 .../doc/modules/applib-ant/pages/Parameter/fileAccept.adoc  |   0
 .../doc/modules/applib-ant/pages/Parameter/maxLength.adoc   |   0
 .../doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc |   0
 .../doc/modules/applib-ant/pages/Parameter/optionality.adoc |   0
 .../modules/applib-ant/pages/Parameter/regexPattern.adoc    |   0
 .../main/doc/modules/applib-ant/pages/ParameterLayout.adoc  |   0
 .../modules/applib-ant/pages/ParameterLayout/cssClass.adoc  |   0
 .../applib-ant/pages/ParameterLayout/describedAs.adoc       |   0
 .../applib-ant/pages/ParameterLayout/labelPosition.adoc     |   0
 .../modules/applib-ant/pages/ParameterLayout/multiLine.adoc |   0
 .../doc/modules/applib-ant/pages/ParameterLayout/named.adoc |   0
 .../pages/ParameterLayout/renderedAsDayBefore.adoc          |   0
 .../applib-ant/pages/ParameterLayout/typicalLength.adoc     |   0
 .../src/main/doc/modules/applib-ant/pages/Pattern.adoc      |   0
 .../doc/modules/applib-ant/pages/PersistenceCapable.adoc    |   0
 .../main/doc/modules/applib-ant/pages/PostConstruct.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/PreDestroy.adoc   |   0
 .../src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc   |   0
 .../src/main/doc/modules/applib-ant/pages/Programmatic.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/Property.adoc     |   0
 .../main/doc/modules/applib-ant/pages/Property/command.adoc |   0
 .../doc/modules/applib-ant/pages/Property/domainEvent.adoc  |   0
 .../main/doc/modules/applib-ant/pages/Property/editing.adoc |   0
 .../doc/modules/applib-ant/pages/Property/fileAccept.adoc   |   0
 .../main/doc/modules/applib-ant/pages/Property/hidden.adoc  |   0
 .../doc/modules/applib-ant/pages/Property/maxLength.adoc    |   0
 .../doc/modules/applib-ant/pages/Property/mustSatisfy.adoc  |   0
 .../doc/modules/applib-ant/pages/Property/notPersisted.adoc |   0
 .../doc/modules/applib-ant/pages/Property/optionality.adoc  |   0
 .../doc/modules/applib-ant/pages/Property/projecting.adoc   |   0
 .../doc/modules/applib-ant/pages/Property/publishing.adoc   |   0
 .../doc/modules/applib-ant/pages/Property/regexPattern.adoc |   0
 .../main/doc/modules/applib-ant/pages/PropertyLayout.adoc   |   0
 .../modules/applib-ant/pages/PropertyLayout/cssClass.adoc   |   0
 .../applib-ant/pages/PropertyLayout/describedAs.adoc        |   0
 .../doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc |   0
 .../applib-ant/pages/PropertyLayout/labelPosition.adoc      |   0
 .../modules/applib-ant/pages/PropertyLayout/multiLine.adoc  |   0
 .../doc/modules/applib-ant/pages/PropertyLayout/named.adoc  |   0
 .../modules/applib-ant/pages/PropertyLayout/navigable.adoc  |   0
 .../applib-ant/pages/PropertyLayout/promptStyle.adoc        |   0
 .../pages/PropertyLayout/renderedAsDayBefore.adoc           |   0
 .../applib-ant/pages/PropertyLayout/typicalLength.adoc      |   0
 .../modules/applib-ant/pages/PropertyLayout/unchanging.adoc |   0
 .../main/doc/modules/applib-ant/pages/RequestScoped.adoc    |   0
 .../applib/src/main/doc/modules/applib-ant/pages/Title.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/ViewModel.adoc    |   0
 .../doc/modules/applib-ant/pages/ViewModel/objectType.adoc  |   0
 .../main/doc/modules/applib-ant/pages/ViewModelLayout.adoc  |   0
 .../applib-ant/pages/ViewModelLayout/bookmarking.adoc       |   0
 .../modules/applib-ant/pages/ViewModelLayout/cssClass.adoc  |   0
 .../applib-ant/pages/ViewModelLayout/cssClassFa.adoc        |   0
 .../applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc   |   0
 .../applib-ant/pages/ViewModelLayout/describedAs.adoc       |   0
 .../applib-ant/pages/ViewModelLayout/iconUiEvent.adoc       |   0
 .../applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc     |   0
 .../doc/modules/applib-ant/pages/ViewModelLayout/named.adoc |   0
 .../doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc |   0
 .../modules/applib-ant/pages/ViewModelLayout/plural.adoc    |   0
 .../applib-ant/pages/ViewModelLayout/titleUiEvent.adoc      |   0
 .../doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc    |   0
 .../main/doc/modules/applib-ant/pages/XmlRootElement.adoc   |   0
 .../applib/src/main/doc/modules/applib-ant/pages/about.adoc |   0
 .../src/main/doc/modules/applib-ant/pages/about/jdo.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/about/jee.adoc    |   0
 .../src/main/doc/modules/applib-ant/pages/about/main.adoc   |   0
 .../src/main/doc/modules/applib-ant/pages/about/other.adoc  |   0
 .../main/doc/modules/applib-ant/pages/about/partial.adoc    |   0
 .../main/doc/modules/applib-ant/partials/module-nav.adoc    |   0
 .../applib/src/main/doc/modules/applib-cm/examples.sh       |   0
 .../main/doc/modules/applib-cm/examples}/clock/Clock.java   |   0
 .../doc/modules/applib-cm/examples}/clock/package-info.java |   0
 .../modules/applib-cm/examples/domain/DomainObjectList.java |   0
 .../examples}/events/ActionArgumentUsabilityEvent.java      |   0
 .../examples}/events/ActionArgumentVisibilityEvent.java     |   0
 .../examples/events/domain/AbstractDomainEvent.java         |   0
 .../examples}/events/domain/ActionDomainEvent.java          |   0
 .../examples}/events/domain/CollectionDomainEvent.java      |   0
 .../applib-cm/examples}/events/domain/EventObjectBase.java  |   0
 .../examples}/events/domain/PropertyDomainEvent.java        |   0
 .../examples}/events/lifecycle/AbstractLifecycleEvent.java  |   0
 .../examples}/events/lifecycle/ObjectCreatedEvent.java      |   0
 .../examples}/events/lifecycle/ObjectLoadedEvent.java       |   0
 .../examples}/events/lifecycle/ObjectPersistedEvent.java    |   0
 .../examples}/events/lifecycle/ObjectPersistingEvent.java   |   0
 .../examples}/events/lifecycle/ObjectRemovingEvent.java     |   0
 .../examples}/events/lifecycle/ObjectUpdatedEvent.java      |   0
 .../examples}/events/lifecycle/ObjectUpdatingEvent.java     |   0
 .../applib-cm/examples/events/ui/AbstractUiEvent.java       |   0
 .../applib-cm/examples}/events/ui/CssClassUiEvent.java      |   0
 .../modules/applib-cm/examples}/events/ui/IconUiEvent.java  |   0
 .../applib-cm/examples}/events/ui/LayoutUiEvent.java        |   0
 .../modules/applib-cm/examples}/events/ui/TitleUiEvent.java |   0
 .../examples}/layout/component/ActionLayoutData.java        |   0
 .../examples}/layout/component/ActionLayoutDataOwner.java   |   0
 .../examples/layout/component/CollectionLayoutData.java     |   0
 .../layout/component/CollectionLayoutDataOwner.java         |   0
 .../examples}/layout/component/DomainObjectLayoutData.java  |   0
 .../layout/component/DomainObjectLayoutDataOwner.java       |   0
 .../applib-cm/examples/layout/component/FieldSet.java       |   0
 .../applib-cm/examples}/layout/component/FieldSetOwner.java |   0
 .../examples}/layout/component/HasBookmarking.java          |   0
 .../applib-cm/examples}/layout/component/HasCssClass.java   |   0
 .../applib-cm/examples}/layout/component/HasCssClassFa.java |   0
 .../examples}/layout/component/HasDescribedAs.java          |   0
 .../applib-cm/examples}/layout/component/HasHidden.java     |   0
 .../applib-cm/examples}/layout/component/HasNamed.java      |   0
 .../applib-cm/examples}/layout/component/MemberRegion.java  |   0
 .../examples}/layout/component/MemberRegionOwner.java       |   0
 .../modules/applib-cm/examples}/layout/component/Owned.java |   0
 .../modules/applib-cm/examples}/layout/component/Owner.java |   0
 .../examples/layout/component/PropertyLayoutData.java       |   0
 .../examples}/layout/component/ServiceActionLayoutData.java |   0
 .../layout/component/ServiceActionLayoutDataOwner.java      |   0
 .../applib-cm/examples}/layout/component/package-info.java  |   0
 .../doc/modules/applib-cm/examples}/layout/grid/Grid.java   |   0
 .../applib-cm/examples/layout/grid/GridAbstract.java        |   0
 .../examples}/layout/grid/bootstrap3/BS3ClearFix.java       |   0
 .../examples}/layout/grid/bootstrap3/BS3ClearFixHidden.java |   0
 .../layout/grid/bootstrap3/BS3ClearFixVisible.java          |   0
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Col.java   |   0
 .../examples}/layout/grid/bootstrap3/BS3Element.java        |   0
 .../layout/grid/bootstrap3/BS3ElementAbstract.java          |   0
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java  |   0
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Row.java   |   0
 .../examples}/layout/grid/bootstrap3/BS3RowContent.java     |   0
 .../layout/grid/bootstrap3/BS3RowContentOwner.java          |   0
 .../examples}/layout/grid/bootstrap3/BS3RowOwner.java       |   0
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java   |   0
 .../examples/layout/grid/bootstrap3/BS3TabGroup.java        |   0
 .../examples}/layout/grid/bootstrap3/BS3TabGroupOwner.java  |   0
 .../examples}/layout/grid/bootstrap3/BS3TabOwner.java       |   0
 .../examples}/layout/grid/bootstrap3/HasCssId.java          |   0
 .../applib-cm/examples}/layout/grid/bootstrap3/Size.java    |   0
 .../examples}/layout/grid/bootstrap3/SizeSpan.java          |   0
 .../examples}/layout/grid/bootstrap3/WithinGrid.java        |   0
 .../examples}/layout/grid/bootstrap3/package-info.java      |   0
 .../doc/modules/applib-cm/examples}/layout/links/Link.java  |   0
 .../applib-cm/examples}/layout/links/package-info.java      |   0
 .../modules/applib-cm/examples}/layout/menubars/Menu.java   |   0
 .../applib-cm/examples}/layout/menubars/MenuBar.java        |   0
 .../applib-cm/examples}/layout/menubars/MenuBars.java       |   0
 .../examples/layout/menubars/MenuBarsAbstract.java          |   0
 .../applib-cm/examples}/layout/menubars/MenuSection.java    |   0
 .../examples/layout/menubars/bootstrap3/BS3Menu.java        |   0
 .../examples/layout/menubars/bootstrap3/BS3MenuBar.java     |   0
 .../examples}/layout/menubars/bootstrap3/BS3MenuBars.java   |   0
 .../examples/layout/menubars/bootstrap3/BS3MenuSection.java |   0
 .../examples}/layout/menubars/bootstrap3/package-info.java  |   0
 .../modules/applib-cm/examples}/layout/package-info.java    |   0
 .../modules/applib-cm/examples}/mixins/MixinConstants.java  |   0
 .../doc/modules/applib-cm/examples}/mixins/dto/Dto.java     |   0
 .../applib-cm/examples}/mixins/dto/DtoMappingHelper.java    |   0
 .../applib-cm/examples}/mixins/dto/Dto_downloadXml.java     |   0
 .../applib-cm/examples/mixins/dto/Dto_downloadXsd.java      |   0
 .../applib-cm/examples}/mixins/dto/package-info.java        |   0
 .../examples}/mixins/layout/Object_downloadLayoutXml.java   |   0
 .../examples}/mixins/layout/Object_openRestApi.java         |   0
 .../examples}/mixins/layout/Object_rebuildMetamodel.java    |   0
 .../mixins/metamodel/Object_downloadMetaModelXml.java       |   0
 .../examples}/mixins/metamodel/Object_objectIdentifier.java |   0
 .../examples}/mixins/metamodel/Object_objectType.java       |   0
 .../examples}/mixins/timestamp/HoldsUpdatedAt.java          |   0
 .../examples}/mixins/timestamp/HoldsUpdatedBy.java          |   0
 .../applib-cm/examples}/mixins/timestamp/Timestampable.java |   0
 .../applib-cm/examples}/mixins/timestamp/package-info.java  |   0
 .../modules/applib-cm/examples}/security/RoleMemento.java   |   0
 .../modules/applib-cm/examples}/security/UserMemento.java   |   0
 .../modules/applib-cm/examples}/security/package-info.java  |   0
 .../applib-cm/examples}/spec/AbstractSpecification.java     |   0
 .../applib-cm/examples}/spec/AbstractSpecification2.java    |   0
 .../doc/modules/applib-cm/examples}/spec/Specification.java |   0
 .../modules/applib-cm/examples}/spec/Specification2.java    |   0
 .../modules/applib-cm/examples}/spec/SpecificationAnd.java  |   0
 .../modules/applib-cm/examples}/spec/SpecificationNot.java  |   0
 .../modules/applib-cm/examples}/spec/SpecificationOr.java   |   0
 .../doc/modules/applib-cm/examples}/spec/package-info.java  |   0
 .../doc/modules/applib-cm/examples}/tree/LazyTreeNode.java  |   0
 .../doc/modules/applib-cm/examples}/tree/TreeAdapter.java   |   0
 .../main/doc/modules/applib-cm/examples}/tree/TreeNode.java |   0
 .../examples}/tree/TreeNode_iteratorBreadthFirst.java       |   0
 .../examples}/tree/TreeNode_iteratorDepthFirst.java         |   0
 .../examples}/tree/TreeNode_iteratorHierarchyUp.java        |   0
 .../main/doc/modules/applib-cm/examples}/tree/TreePath.java |   0
 .../modules/applib-cm/examples}/tree/TreePath_Default.java  |   0
 .../doc/modules/applib-cm/examples}/tree/TreeState.java     |   0
 .../modules/applib-cm/examples}/tree/TreeState_Default.java |   0
 .../main/doc/modules/applib-cm/examples}/util/Enums.java    |   0
 .../main/doc/modules/applib-cm/examples}/util/Equality.java |   0
 .../main/doc/modules/applib-cm/examples}/util/Hashing.java  |   0
 .../doc/modules/applib-cm/examples}/util/JaxbAdapters.java  |   0
 .../main/doc/modules/applib-cm/examples}/util/JaxbUtil.java |   0
 .../applib-cm/examples}/util/ObjectContract_Empty.java      |   0
 .../applib-cm/examples}/util/ObjectContract_Impl.java       |   0
 .../applib-cm/examples}/util/ObjectContract_Parser.java     |   0
 .../modules/applib-cm/examples}/util/ObjectContracts.java   |   0
 .../doc/modules/applib-cm/examples}/util/ReasonBuffer.java  |   0
 .../doc/modules/applib-cm/examples}/util/ReasonBuffer2.java |   0
 .../main/doc/modules/applib-cm/examples}/util/Reasons.java  |   0
 .../doc/modules/applib-cm/examples}/util/TitleBuffer.java   |   0
 .../applib-cm/examples}/util/TitleBufferException.java      |   0
 .../main/doc/modules/applib-cm/examples}/util/ToString.java |   0
 .../doc/modules/applib-cm/examples}/util/package-info.java  |   0
 .../applib-cm/examples}/util/schema/ChangesDtoUtils.java    |   0
 .../applib-cm/examples}/util/schema/CommandDtoUtils.java    |   0
 .../applib-cm/examples}/util/schema/CommonDtoUtils.java     |   0
 .../examples}/util/schema/InteractionDtoUtils.java          |   0
 .../examples}/util/schema/MemberExecutionDtoUtils.java      |   0
 .../main/doc/modules/applib-cm/examples}/value/Blob.java    |   0
 .../modules/applib-cm/examples}/value/BlobClobFactory.java  |   0
 .../main/doc/modules/applib-cm/examples}/value/Clob.java    |   0
 .../main/doc/modules/applib-cm/examples}/value/Image.java   |   0
 .../applib-cm/examples}/value/LocalResourcePath.java        |   0
 .../main/doc/modules/applib-cm/examples}/value/Markup.java  |   0
 .../applib-cm/examples}/value/NamedWithMimeType.java        |   0
 .../doc/modules/applib-cm/examples}/value/Password.java     |   0
 .../doc/modules/applib-cm/examples}/value/package-info.java |   0
 .../images/reference-classes/issue-in-more-detail.png       | Bin
 .../images/reference-methods/prefixes/choices/dependent.png | Bin
 .../reference-methods/reserved/cssClass/strikethrough.png   | Bin
 .../reference-methods/reserved/iconName/differing.pdn       | Bin
 .../reference-methods/reserved/iconName/differing.png       | Bin
 .../reference-methods/reserved/iconName/png-files.png       | Bin
 .../doc/modules/applib-cm}/images/value-types/markup.png    | Bin
 .../applib/src/main/doc/modules/applib-cm}/nav.adoc         |   0
 .../applib/src/main/doc/modules/applib-cm/pages/about.adoc  |   0
 .../src/main/doc/modules/applib-cm/pages/classes.adoc       |   0
 .../applib-cm/pages/classes/AppManifest-bootstrapping.adoc  |   0
 .../applib-cm/pages/classes/AppManifest2-bootstrapping.adoc |   0
 .../doc/modules/applib-cm/pages/classes/contributee.adoc    |   0
 .../pages/classes/contributee/HasTransactionId.adoc         |   0
 .../applib-cm/pages/classes/contributee/HasUserName.adoc    |   0
 .../doc/modules/applib-cm/pages/classes/domainevent.adoc    |   0
 .../pages/classes/domainevent/AbstractDomainEvent.adoc      |   0
 .../pages/classes/domainevent/ActionDomainEvent.adoc        |   0
 .../pages/classes/domainevent/CollectionDomainEvent.adoc    |   0
 .../pages/classes/domainevent/PropertyDomainEvent.adoc      |   0
 .../src/main/doc/modules/applib-cm/pages/classes/i18n.adoc  |   0
 .../applib-cm/pages/classes/i18n/TranslatableString.adoc    |   0
 .../main/doc/modules/applib-cm/pages/classes/layout.adoc    |   0
 .../doc/modules/applib-cm/pages/classes/lifecycleevent.adoc |   0
 .../classes/lifecycleevent/AbstractLifecycleEvent.adoc      |   0
 .../pages/classes/lifecycleevent/ObjectCreatedEvent.adoc    |   0
 .../pages/classes/lifecycleevent/ObjectLoadedEvent.adoc     |   0
 .../pages/classes/lifecycleevent/ObjectPersistedEvent.adoc  |   0
 .../pages/classes/lifecycleevent/ObjectPersistingEvent.adoc |   0
 .../pages/classes/lifecycleevent/ObjectRemovingEvent.adoc   |   0
 .../pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc    |   0
 .../pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc   |   0
 .../main/doc/modules/applib-cm/pages/classes/menubars.adoc  |   0
 .../main/doc/modules/applib-cm/pages/classes/mixins.adoc    |   0
 .../doc/modules/applib-cm/pages/classes/mixins/Dto.adoc     |   0
 .../doc/modules/applib-cm/pages/classes/mixins/Object.adoc  |   0
 .../modules/applib-cm/pages/classes/mixins/Persistable.adoc |   0
 .../src/main/doc/modules/applib-cm/pages/classes/roles.adoc |   0
 .../applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc       |   0
 .../applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc       |   0
 .../applib-cm/pages/classes/roles/Timestampable.adoc        |   0
 .../src/main/doc/modules/applib-cm/pages/classes/spec.adoc  |   0
 .../src/main/doc/modules/applib-cm/pages/classes/super.adoc |   0
 .../applib-cm/pages/classes/super/AbstractService.adoc      |   0
 .../applib-cm/pages/classes/super/AbstractSubscriber.adoc   |   0
 .../applib-cm/pages/classes/super/AbstractViewModel.adoc    |   0
 .../applib-cm/pages/classes/super/FixtureScript.adoc        |   0
 .../applib-cm/pages/classes/super/FixtureScripts.adoc       |   0
 .../main/doc/modules/applib-cm/pages/classes/uievent.adoc   |   0
 .../applib-cm/pages/classes/uievent/CssClassUiEvent.adoc    |   0
 .../applib-cm/pages/classes/uievent/IconUiEvent.adoc        |   0
 .../applib-cm/pages/classes/uievent/TitleUiEvent.adoc       |   0
 .../main/doc/modules/applib-cm/pages/classes/utility.adoc   |   0
 .../doc/modules/applib-cm/pages/classes/utility/Enums.adoc  |   0
 .../applib-cm/pages/classes/utility/ObjectContracts.adoc    |   0
 .../modules/applib-cm/pages/classes/utility/Reasons.adoc    |   0
 .../applib-cm/pages/classes/utility/TitleBuffer.adoc        |   0
 .../doc/modules/applib-cm/pages/classes/value-types.adoc    |   0
 .../modules/applib-cm/pages/classes/value-types/Blob.adoc   |   0
 .../modules/applib-cm/pages/classes/value-types/Clob.adoc   |   0
 .../modules/applib-cm/pages/classes/value-types/Color.adoc  |   0
 .../modules/applib-cm/pages/classes/value-types/Markup.adoc |   0
 .../modules/applib-cm/pages/classes/value-types/Money.adoc  |   0
 .../applib-cm/pages/classes/value-types/Password.adoc       |   0
 .../src/main/doc/modules/applib-cm/pages/methods.adoc       |   0
 .../main/doc/modules/applib-cm/pages/methods/lifecycle.adoc |   0
 .../modules/applib-cm/pages/methods/lifecycle/created.adoc  |   0
 .../modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc  |   0
 .../modules/applib-cm/pages/methods/lifecycle/loaded.adoc   |   0
 .../applib-cm/pages/methods/lifecycle/persisted.adoc        |   0
 .../applib-cm/pages/methods/lifecycle/persisting.adoc       |   0
 .../modules/applib-cm/pages/methods/lifecycle/removed.adoc  |   0
 .../modules/applib-cm/pages/methods/lifecycle/removing.adoc |   0
 .../modules/applib-cm/pages/methods/lifecycle/updated.adoc  |   0
 .../modules/applib-cm/pages/methods/lifecycle/updating.adoc |   0
 .../main/doc/modules/applib-cm/pages/methods/prefixes.adoc  |   0
 .../doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc |   0
 .../applib-cm/pages/methods/prefixes/autoComplete.adoc      |   0
 .../modules/applib-cm/pages/methods/prefixes/choices.adoc   |   0
 .../doc/modules/applib-cm/pages/methods/prefixes/clear.adoc |   0
 .../modules/applib-cm/pages/methods/prefixes/default.adoc   |   0
 .../modules/applib-cm/pages/methods/prefixes/disable.adoc   |   0
 .../doc/modules/applib-cm/pages/methods/prefixes/get.adoc   |   0
 .../doc/modules/applib-cm/pages/methods/prefixes/hide.adoc  |   0
 .../modules/applib-cm/pages/methods/prefixes/modify.adoc    |   0
 .../applib-cm/pages/methods/prefixes/removeFrom.adoc        |   0
 .../doc/modules/applib-cm/pages/methods/prefixes/set.adoc   |   0
 .../modules/applib-cm/pages/methods/prefixes/validate.adoc  |   0
 .../applib-cm/pages/methods/prefixes/validateAddTo.adoc     |   0
 .../pages/methods/prefixes/validateRemoveFrom.adoc          |   0
 .../main/doc/modules/applib-cm/pages/methods/reserved.adoc  |   0
 .../modules/applib-cm/pages/methods/reserved/cssClass.adoc  |   0
 .../modules/applib-cm/pages/methods/reserved/disable.adoc   |   0
 .../doc/modules/applib-cm/pages/methods/reserved/getId.adoc |   0
 .../doc/modules/applib-cm/pages/methods/reserved/hide.adoc  |   0
 .../modules/applib-cm/pages/methods/reserved/iconName.adoc  |   0
 .../modules/applib-cm/pages/methods/reserved/layout.adoc    |   0
 .../doc/modules/applib-cm/pages/methods/reserved/title.adoc |   0
 .../modules/applib-cm/pages/methods/reserved/validate.adoc  |   0
 .../applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc  |   0
 .../src/main/doc/modules/applib-cm/partials/module-nav.adoc |   0
 .../applib/src/main/doc/modules/applib-svc/examples.sh      |   0
 .../modules/applib-svc/examples}/services/HasUniqueId.java  |   0
 .../modules/applib-svc/examples}/services/HasUsername.java  |   0
 .../services/RepresentsInteractionMemberExecution.java      |   0
 .../applib-svc/examples}/services/WithTransactionScope.java |   0
 .../services/acceptheader/AcceptHeaderService.java          |   0
 .../services/appfeat/ApplicationFeatureRepository.java      |   0
 .../examples}/services/appfeat/ApplicationMemberType.java   |   0
 .../applib-svc/examples}/services/appfeat/package-info.java |   0
 .../examples}/services/audit/AuditEntryPropertyIdType.java  |   0
 .../services/audit/AuditEntryPropertyValueType.java         |   0
 .../applib-svc/examples}/services/audit/AuditerService.java |   0
 .../examples}/services/audit/AuditerServiceLogging.java     |   0
 .../applib-svc/examples}/services/audit/package-info.java   |   0
 .../services/background/BackgroundCommandService.java       |   0
 .../examples}/services/background/package-info.java         |   0
 .../applib-svc/examples}/services/bookmark/Bookmark.java    |   0
 .../examples}/services/bookmark/BookmarkHolder.java         |   0
 .../examples}/services/bookmark/BookmarkHolder_lookup.java  |   0
 .../examples}/services/bookmark/BookmarkHolder_object.java  |   0
 .../examples}/services/bookmark/BookmarkService.java        |   0
 .../examples}/services/bookmark/package-info.java           |   0
 .../examples}/services/bookmarkui/BookmarkUiService.java    |   0
 .../applib-svc/examples}/services/clock/ClockService.java   |   0
 .../applib-svc/examples}/services/clock/package-info.java   |   0
 .../applib-svc/examples}/services/command/Command.java      |   0
 .../examples}/services/command/CommandContext.java          |   0
 .../examples}/services/command/CommandDefault.java          |   0
 .../examples}/services/command/CommandDtoProcessor.java     |   0
 .../command/CommandDtoProcessorForActionAbstract.java       |   0
 .../command/CommandDtoProcessorForPropertyAbstract.java     |   0
 .../examples}/services/command/CommandExecutorService.java  |   0
 .../examples}/services/command/CommandWithDto.java          |   0
 .../applib-svc/examples}/services/command/package-info.java |   0
 .../examples}/services/command/spi/CommandService.java      |   0
 .../examples}/services/confview/ConfigurationMenu.java      |   0
 .../examples}/services/confview/ConfigurationProperty.java  |   0
 .../services/confview/ConfigurationProperty.layout.xml      |   0
 .../examples}/services/confview/ConfigurationProperty.png   | Bin
 .../services/confview/ConfigurationViewService.java         |   0
 .../examples}/services/confview/package-info.java           |   0
 .../examples}/services/conmap/ContentMappingService.java    |   0
 .../conmap/command/ContentMappingServiceForCommandDto.java  |   0
 .../conmap/command/ContentMappingServiceForCommandsDto.java |   0
 .../conmap/command/spi/CommandDtoProcessorService.java      |   0
 .../applib-svc/examples}/services/conmap/package-info.java  |   0
 .../applib-svc/examples}/services/email/EmailService.java   |   0
 .../applib-svc/examples}/services/email/package-info.java   |   0
 .../applib-svc/examples}/services/error/ErrorDetails.java   |   0
 .../examples}/services/error/ErrorReportingService.java     |   0
 .../modules/applib-svc/examples}/services/error/Ticket.java |   0
 .../applib-svc/examples}/services/error/package-info.java   |   0
 .../examples}/services/eventbus/EventBusService.java        |   0
 .../examples}/services/eventbus/package-info.java           |   0
 .../examples}/services/exceprecog/ExceptionRecognizer.java  |   0
 .../services/exceprecog/ExceptionRecognizerAbstract.java    |   0
 .../services/exceprecog/ExceptionRecognizerComposite.java   |   0
 .../services/exceprecog/ExceptionRecognizerForType.java     |   0
 .../services/exceprecog/TranslatableException.java          |   0
 .../examples}/services/exceprecog/package-info.java         |   0
 .../examples}/services/factory/FactoryService.java          |   0
 .../applib-svc/examples}/services/factory/package-info.java |   0
 .../examples}/services/grid/GridLoaderService.java          |   0
 .../applib-svc/examples}/services/grid/GridService.java     |   0
 .../examples}/services/grid/GridSystemService.java          |   0
 .../applib-svc/examples}/services/grid/package-info.java    |   0
 .../applib-svc/examples}/services/health/Health.java        |   0
 .../examples}/services/health/HealthCheckService.java       |   0
 .../applib-svc/examples}/services/hint/HintStore.java       |   0
 .../applib-svc/examples}/services/hint/package-info.java    |   0
 .../applib-svc/examples}/services/i18n/LocaleProvider.java  |   0
 .../examples}/services/i18n/TranslatableString.java         |   0
 .../examples}/services/i18n/TranslationService.java         |   0
 .../examples}/services/i18n/TranslationsResolver.java       |   0
 .../applib-svc/examples}/services/i18n/package-info.java    |   0
 .../applib-svc/examples}/services/iactn/Interaction.java    |   0
 .../examples}/services/iactn/InteractionContext.java        |   0
 .../applib-svc/examples}/services/iactn/package-info.java   |   0
 .../examples}/services/inject/ServiceInjector.java          |   0
 .../services/jaxb/CatalogingSchemaOutputResolver.java       |   0
 .../applib-svc/examples}/services/jaxb/JaxbService.java     |   0
 .../examples}/services/jaxb/JaxbServiceDefault.java         |   0
 .../examples}/services/jaxb/StreamResultWithWriter.java     |   0
 .../applib-svc/examples}/services/jaxb/package-info.java    |   0
 .../applib-svc/examples}/services/layout/LayoutService.java |   0
 .../examples}/services/layout/LayoutServiceMenu.java        |   0
 .../applib-svc/examples}/services/layout/package-info.java  |   0
 .../examples}/services/linking/DeepLinkService.java         |   0
 .../applib-svc/examples}/services/linking/package-info.java |   0
 .../examples}/services/menu/MenuBarsLoaderService.java      |   0
 .../applib-svc/examples}/services/menu/MenuBarsService.java |   0
 .../examples}/services/message/MessageService.java          |   0
 .../applib-svc/examples}/services/message/package-info.java |   0
 .../examples}/services/metamodel/DomainMember.java          |   0
 .../examples}/services/metamodel/DomainModel.java           |   0
 .../examples}/services/metamodel/MetaModelService.java      |   0
 .../examples}/services/metamodel/MetaModelServicesMenu.java |   0
 .../examples}/services/metamodel/package-info.java          |   0
 .../examples}/services/metrics/MetricsService.java          |   0
 .../applib-svc/examples}/services/metrics/package-info.java |   0
 .../modules/applib-svc/examples}/services/package-info.java |   0
 .../examples}/services/publish/PublishedObjects.java        |   0
 .../examples}/services/publish/PublisherService.java        |   0
 .../examples}/services/publish/PublisherServiceLogging.java |   0
 .../applib-svc/examples}/services/publish/package-info.java |   0
 .../services/queryresultscache/QueryResultCacheControl.java |   0
 .../services/queryresultscache/QueryResultsCache.java       |   0
 .../queryresultscache/QueryResultsCacheDefault.java         |   0
 .../examples}/services/queryresultscache/package-info.java  |   0
 .../examples}/services/registry/ServiceRegistry.java        |   0
 .../examples}/services/registry/package-info.java           |   0
 .../examples}/services/repository/RepositoryService.java    |   0
 .../examples}/services/repository/package-info.java         |   0
 .../examples}/services/routing/RoutingService.java          |   0
 .../applib-svc/examples}/services/routing/package-info.java |   0
 .../examples}/services/scratchpad/Scratchpad.java           |   0
 .../examples}/services/scratchpad/package-info.java         |   0
 .../examples}/services/session/SessionLoggingService.java   |   0
 .../applib-svc/examples}/services/session/package-info.java |   0
 .../services/sessmgmt/SessionManagementService.java         |   0
 .../examples}/services/sessmgmt/package-info.java           |   0
 .../applib-svc/examples}/services/sudo/SudoService.java     |   0
 .../applib-svc/examples}/services/sudo/package-info.java    |   0
 .../examples}/services/swagger/SwaggerService.java          |   0
 .../applib-svc/examples}/services/swagger/package-info.java |   0
 .../services/tablecol/TableColumnOrderService.java          |   0
 .../applib-svc/examples}/services/title/TitleService.java   |   0
 .../applib-svc/examples}/services/title/package-info.java   |   0
 .../examples}/services/urlencoding/UrlEncodingService.java  |   0
 .../UrlEncodingServiceUsingBaseEncodingAbstract.java        |   0
 .../urlencoding/UrlEncodingServiceWithCompression.java      |   0
 .../examples}/services/urlencoding/package-info.java        |   0
 .../applib-svc/examples}/services/user/UserService.java     |   0
 .../applib-svc/examples}/services/user/package-info.java    |   0
 .../examples}/services/userprof/UserProfileService.java     |   0
 .../examples}/services/userprof/package-info.java           |   0
 .../services/userreg/EmailNotificationService.java          |   0
 .../applib-svc/examples}/services/userreg/UserDetails.java  |   0
 .../examples}/services/userreg/UserRegistrationService.java |   0
 .../services/userreg/events/EmailEventAbstract.java         |   0
 .../services/userreg/events/EmailRegistrationEvent.java     |   0
 .../services/userreg/events/PasswordResetEvent.java         |   0
 .../applib-svc/examples}/services/userreg/package-info.java |   0
 .../applib-svc/examples}/services/wrapper/AsyncWrap.java    |   0
 .../examples}/services/wrapper/DisabledException.java       |   0
 .../examples}/services/wrapper/HiddenException.java         |   0
 .../examples}/services/wrapper/InteractionException.java    |   0
 .../examples}/services/wrapper/InvalidException.java        |   0
 .../examples}/services/wrapper/WrapperFactory.java          |   0
 .../examples}/services/wrapper/WrappingObject.java          |   0
 .../examples}/services/wrapper/events/AccessEvent.java      |   0
 .../services/wrapper/events/ActionArgumentEvent.java        |   0
 .../services/wrapper/events/ActionInvocationEvent.java      |   0
 .../services/wrapper/events/ActionUsabilityEvent.java       |   0
 .../services/wrapper/events/ActionVisibilityEvent.java      |   0
 .../services/wrapper/events/CollectionAccessEvent.java      |   0
 .../services/wrapper/events/CollectionAddToEvent.java       |   0
 .../services/wrapper/events/CollectionMethodEvent.java      |   0
 .../services/wrapper/events/CollectionRemoveFromEvent.java  |   0
 .../services/wrapper/events/CollectionUsabilityEvent.java   |   0
 .../services/wrapper/events/CollectionVisibilityEvent.java  |   0
 .../examples}/services/wrapper/events/InteractionEvent.java |   0
 .../examples}/services/wrapper/events/ObjectTitleEvent.java |   0
 .../services/wrapper/events/ObjectValidityEvent.java        |   0
 .../services/wrapper/events/ObjectVisibilityEvent.java      |   0
 .../examples}/services/wrapper/events/ParseValueEvent.java  |   0
 .../services/wrapper/events/PropertyAccessEvent.java        |   0
 .../services/wrapper/events/PropertyModifyEvent.java        |   0
 .../services/wrapper/events/PropertyUsabilityEvent.java     |   0
 .../services/wrapper/events/PropertyVisibilityEvent.java    |   0
 .../services/wrapper/events/ProposedHolderEvent.java        |   0
 .../examples}/services/wrapper/events/UsabilityEvent.java   |   0
 .../examples}/services/wrapper/events/ValidityEvent.java    |   0
 .../examples}/services/wrapper/events/VisibilityEvent.java  |   0
 .../examples}/services/wrapper/events/package-info.java     |   0
 .../services/wrapper/listeners/InteractionAdapter.java      |   0
 .../services/wrapper/listeners/InteractionListener.java     |   0
 .../applib-svc/examples}/services/wrapper/package-info.java |   0
 .../applib-svc/examples}/services/xactn/Transaction.java    |   0
 .../applib-svc/examples}/services/xactn/TransactionId.java  |   0
 .../examples}/services/xactn/TransactionService.java        |   0
 .../examples}/services/xactn/TransactionState.java          |   0
 .../applib-svc/examples}/services/xactn/package-info.java   |   0
 .../examples}/services/xmlsnapshot/XmlSnapshotService.java  |   0
 .../services/xmlsnapshot/XmlSnapshotServiceAbstract.java    |   0
 .../examples}/services/xmlsnapshot/package-info.java        |   0
 .../images/reference-services-api/acceptheaderservice.png   | Bin
 .../images/reference-services-api/acceptheaderservice.pptx  | Bin
 .../ErrorReportingService/kitchensink-example.png           | Bin
 .../action-invocation-published-to-stderr.png               | Bin
 .../EventSerializer/changed-object-published-to-stderr.png  | Bin
 .../PublishingService/yuml.me-23db58a4.png                  | Bin
 .../reference-services-spi/UserProfileService/todoapp.png   | Bin
 .../applib-svc/images/reference-services/categories.png     | Bin
 .../applib-svc/images/reference-services/categories.pptx    | Bin
 .../images/reference-services/commands-and-events.png       | Bin
 .../images/reference-services/commands-and-events.pptx      | Bin
 .../applib/src/main/doc/modules/applib-svc}/nav.adoc        |   0
 .../applib/src/main/doc/modules/applib-svc/pages/about.adoc |   0
 .../doc/modules/applib-svc/pages/application-layer-api.adoc |   0
 .../pages/application-layer-api/BackgroundService.adoc      |   0
 .../BackgroundService/BackgroundCommandExecution.adoc       |   0
 .../application-layer-api/BackgroundService/Quartz.adoc     |   0
 .../pages/application-layer-api/CommandContext.adoc         |   0
 .../pages/application-layer-api/CommandExecutorService.adoc |   0
 .../pages/application-layer-api/DtoMappingHelper.adoc       |   0
 .../pages/application-layer-api/InteractionContext.adoc     |   0
 .../pages/application-layer-api/MessageService.adoc         |   0
 .../application-layer-api/SessionManagementService.adoc     |   0
 .../pages/application-layer-api/TitleService.adoc           |   0
 .../pages/application-layer-api/TransactionService.adoc     |   0
 .../pages/application-layer-api/WrapperFactory.adoc         |   0
 .../doc/modules/applib-svc/pages/application-layer-spi.adoc |   0
 .../application-layer-spi/BackgroundCommandService.adoc     |   0
 .../pages/application-layer-spi/CommandService.adoc         |   0
 .../pages/application-layer-spi/HealthCheckService.adoc     |   0
 .../application-layer-spi/HomePageProviderService.adoc      |   0
 .../doc/modules/applib-svc/pages/bootstrapping-spi.adoc     |   0
 .../pages/bootstrapping-spi/ClassDiscoveryService.adoc      |   0
 .../main/doc/modules/applib-svc/pages/core-domain-api.adoc  |   0
 .../applib-svc/pages/core-domain-api/ClockService.adoc      |   0
 .../pages/core-domain-api/ConfigurationService.adoc         |   0
 .../applib-svc/pages/core-domain-api/EventBusService.adoc   |   0
 .../applib-svc/pages/core-domain-api/FactoryService.adoc    |   0
 .../applib-svc/pages/core-domain-api/Scratchpad.adoc        |   0
 .../applib-svc/pages/core-domain-api/UserService.adoc       |   0
 .../main/doc/modules/applib-svc/pages/integration-api.adoc  |   0
 .../applib-svc/pages/integration-api/BookmarkService.adoc   |   0
 .../applib-svc/pages/integration-api/EmailService.adoc      |   0
 .../applib-svc/pages/integration-api/JaxbService.adoc       |   0
 .../applib-svc/pages/integration-api/MementoService.adoc    |   0
 .../pages/integration-api/XmlSnapshotService.adoc           |   0
 .../src/main/doc/modules/applib-svc/pages/metadata-api.adoc |   0
 .../pages/metadata-api/ApplicationFeatureRepository.adoc    |   0
 .../applib-svc/pages/metadata-api/LayoutService.adoc        |   0
 .../applib-svc/pages/metadata-api/MetamodelService.adoc     |   0
 .../applib-svc/pages/metadata-api/ServiceRegistry.adoc      |   0
 .../applib-svc/pages/metadata-api/SwaggerService.adoc       |   0
 .../doc/modules/applib-svc/pages/persistence-layer-api.adoc |   0
 .../pages/persistence-layer-api/H2ManagerMenu.adoc          |   0
 .../pages/persistence-layer-api/HsqlDbManagerMenu.adoc      |   0
 .../pages/persistence-layer-api/IsisJdoSupport.adoc         |   0
 .../pages/persistence-layer-api/MetricsService.adoc         |   0
 .../pages/persistence-layer-api/QueryResultsCache.adoc      |   0
 .../pages/persistence-layer-api/RepositoryService.adoc      |   0
 .../doc/modules/applib-svc/pages/persistence-layer-spi.adoc |   0
 .../pages/persistence-layer-spi/AuditerService.adoc         |   0
 .../pages/persistence-layer-spi/PublisherService.adoc       |   0
 .../persistence-layer-spi/UserRegistrationService.adoc      |   0
 .../modules/applib-svc/pages/presentation-layer-api.adoc    |   0
 .../pages/presentation-layer-api/AcceptHeaderService.adoc   |   0
 .../pages/presentation-layer-api/BookmarkUiService.adoc     |   0
 .../presentation-layer-api/ConfigurationViewService.adoc    |   0
 .../pages/presentation-layer-api/DeepLinkService.adoc       |   0
 .../pages/presentation-layer-api/GuiceBeanProvider.adoc     |   0
 .../modules/applib-svc/pages/presentation-layer-spi.adoc    |   0
 .../pages/presentation-layer-spi/ContentMappingService.adoc |   0
 .../presentation-layer-spi/EmailNotificationService.adoc    |   0
 .../pages/presentation-layer-spi/ErrorReportingService.adoc |   0
 .../pages/presentation-layer-spi/ExceptionRecognizer.adoc   |   0
 .../pages/presentation-layer-spi/GridLoaderService.adoc     |   0
 .../pages/presentation-layer-spi/GridService.adoc           |   0
 .../pages/presentation-layer-spi/GridSystemService.adoc     |   0
 .../applib-svc/pages/presentation-layer-spi/HintStore.adoc  |   0
 .../pages/presentation-layer-spi/LocaleProvider.adoc        |   0
 .../pages/presentation-layer-spi/MenuBarsLoaderService.adoc |   0
 .../pages/presentation-layer-spi/MenuBarsService.adoc       |   0
 .../pages/presentation-layer-spi/RoutingService.adoc        |   0
 .../pages/presentation-layer-spi/SessionLoggingService.adoc |   0
 .../presentation-layer-spi/TableColumnOrderService.adoc     |   0
 .../pages/presentation-layer-spi/TranslationService.adoc    |   0
 .../pages/presentation-layer-spi/TranslationsResolver.adoc  |   0
 .../pages/presentation-layer-spi/UrlEncodingService.adoc    |   0
 .../pages/presentation-layer-spi/UserProfileService.adoc    |   0
 .../src/main/doc/modules/applib-svc/pages/testing.adoc      |   0
 .../pages/testing/ExecutionParametersService.adoc           |   0
 .../modules/applib-svc/pages/testing/FixtureScripts.adoc    |   0
 .../pages/testing/FixtureScriptsSpecificationProvider.adoc  |   0
 .../doc/modules/applib-svc/pages/testing/SudoService.adoc   |   0
 .../modules/applib-svc/pages/testing/SwitchUserService.adoc |   0
 .../main/doc/modules/applib-svc/partials/module-nav.adoc    |   0
 .../main/java/org/apache/isis/applib/AbstractService.java   |   0
 .../main/java/org/apache/isis/applib/AbstractViewModel.java |   0
 .../java/org/apache/isis/applib/ApplicationException.java   |   0
 .../main/java/org/apache/isis/applib/FatalException.java    |   0
 .../src/main/java/org/apache/isis/applib/Identifier.java    |   0
 .../main/java/org/apache/isis/applib/IsisModuleApplib.java  |   0
 .../org/apache/isis/applib/NonRecoverableException.java     |   0
 .../java/org/apache/isis/applib/PersistFailedException.java |   0
 .../java/org/apache/isis/applib/RecoverableException.java   |   0
 .../org/apache/isis/applib/RecreatableDomainObject.java     |   0
 .../java/org/apache/isis/applib/RepositoryException.java    |   0
 .../src/main/java/org/apache/isis/applib/ViewModel.java     |   0
 .../applib/adapters/AbstractValueSemanticsProvider.java     |   0
 .../org/apache/isis/applib/adapters/DefaultsProvider.java   |   0
 .../org/apache/isis/applib/adapters/EncoderDecoder.java     |   0
 .../org/apache/isis/applib/adapters/EncodingException.java  |   0
 .../main/java/org/apache/isis/applib/adapters/Parser.java   |   0
 .../org/apache/isis/applib/adapters/ParsingException.java   |   0
 .../apache/isis/applib/adapters/ValueSemanticsProvider.java |   0
 .../java/org/apache/isis/applib/adapters/package-info.java  |   0
 .../java/org/apache/isis/applib}/annotation/Action.java     |   0
 .../org/apache/isis/applib}/annotation/ActionLayout.java    |   0
 .../java/org/apache/isis/applib}/annotation/Auditing.java   |   0
 .../org/apache/isis/applib}/annotation/BookmarkPolicy.java  |   0
 .../java/org/apache/isis/applib}/annotation/Bounding.java   |   0
 .../java/org/apache/isis/applib}/annotation/Collection.java |   0
 .../apache/isis/applib}/annotation/CollectionLayout.java    |   0
 .../apache/isis/applib}/annotation/CommandExecuteIn.java    |   0
 .../apache/isis/applib}/annotation/CommandPersistence.java  |   0
 .../apache/isis/applib}/annotation/CommandReification.java  |   0
 .../java/org/apache/isis/applib}/annotation/Constants.java  |   0
 .../org/apache/isis/applib}/annotation/Contributed.java     |   0
 .../java/org/apache/isis/applib/annotation/Defaulted.java   |   0
 .../org/apache/isis/applib}/annotation/DomainObject.java    |   0
 .../apache/isis/applib}/annotation/DomainObjectLayout.java  |   0
 .../org/apache/isis/applib}/annotation/DomainService.java   |   0
 .../apache/isis/applib}/annotation/DomainServiceLayout.java |   0
 .../java/org/apache/isis/applib}/annotation/Editing.java    |   0
 .../org/apache/isis/applib}/annotation/EqualByContent.java  |   0
 .../java/org/apache/isis/applib}/annotation/Facets.java     |   0
 .../java/org/apache/isis/applib}/annotation/HomePage.java   |   0
 .../org/apache/isis/applib}/annotation/LabelPosition.java   |   0
 .../org/apache/isis/applib}/annotation/MemberOrder.java     |   0
 .../isis/applib}/annotation/MementoSerialization.java       |   0
 .../java/org/apache/isis/applib}/annotation/MinLength.java  |   0
 .../main/java/org/apache/isis/applib}/annotation/Mixin.java |   0
 .../java/org/apache/isis/applib}/annotation/Module.java     |   0
 .../java/org/apache/isis/applib}/annotation/Nature.java     |   0
 .../org/apache/isis/applib}/annotation/NatureOfService.java |   0
 .../java/org/apache/isis/applib}/annotation/Navigable.java  |   0
 .../org/apache/isis/applib}/annotation/Optionality.java     |   0
 .../org/apache/isis/applib}/annotation/OrderPrecedence.java |   0
 .../java/org/apache/isis/applib}/annotation/Parameter.java  |   0
 .../org/apache/isis/applib}/annotation/ParameterLayout.java |   0
 .../org/apache/isis/applib}/annotation/Programmatic.java    |   0
 .../java/org/apache/isis/applib}/annotation/Projecting.java |   0
 .../org/apache/isis/applib}/annotation/PromptStyle.java     |   0
 .../java/org/apache/isis/applib}/annotation/Property.java   |   0
 .../org/apache/isis/applib}/annotation/PropertyLayout.java  |   0
 .../java/org/apache/isis/applib}/annotation/Publishing.java |   0
 .../isis/applib}/annotation/PublishingChangeKind.java       |   0
 .../java/org/apache/isis/applib}/annotation/Redirect.java   |   0
 .../java/org/apache/isis/applib}/annotation/RenderDay.java  |   0
 .../java/org/apache/isis/applib}/annotation/Repainting.java |   0
 .../java/org/apache/isis/applib}/annotation/RestrictTo.java |   0
 .../org/apache/isis/applib}/annotation/SemanticsOf.java     |   0
 .../main/java/org/apache/isis/applib}/annotation/Title.java |   0
 .../main/java/org/apache/isis/applib/annotation/Value.java  |   0
 .../java/org/apache/isis/applib}/annotation/ViewModel.java  |   0
 .../org/apache/isis/applib}/annotation/ViewModelLayout.java |   0
 .../main/java/org/apache/isis/applib}/annotation/Where.java |   0
 .../org/apache/isis/applib}/annotation/package-info.java    |   0
 .../java/org/apache/isis/applib/client/SuppressionType.java |   0
 .../src/main/java/org/apache/isis/applib}/clock/Clock.java  |   0
 .../java/org/apache/isis/applib}/clock/package-info.java    |   0
 .../org/apache/isis/applib/domain/DomainObjectList.java     |   0
 .../isis/applib}/events/ActionArgumentUsabilityEvent.java   |   0
 .../isis/applib}/events/ActionArgumentVisibilityEvent.java  |   0
 .../isis/applib/events/domain/AbstractDomainEvent.java      |   0
 .../isis/applib}/events/domain/ActionDomainEvent.java       |   0
 .../isis/applib}/events/domain/CollectionDomainEvent.java   |   0
 .../apache/isis/applib}/events/domain/EventObjectBase.java  |   0
 .../isis/applib}/events/domain/PropertyDomainEvent.java     |   0
 .../applib}/events/lifecycle/AbstractLifecycleEvent.java    |   0
 .../isis/applib}/events/lifecycle/ObjectCreatedEvent.java   |   0
 .../isis/applib}/events/lifecycle/ObjectLoadedEvent.java    |   0
 .../isis/applib}/events/lifecycle/ObjectPersistedEvent.java |   0
 .../applib}/events/lifecycle/ObjectPersistingEvent.java     |   0
 .../isis/applib}/events/lifecycle/ObjectRemovingEvent.java  |   0
 .../isis/applib}/events/lifecycle/ObjectUpdatedEvent.java   |   0
 .../isis/applib}/events/lifecycle/ObjectUpdatingEvent.java  |   0
 .../org/apache/isis/applib/events/ui/AbstractUiEvent.java   |   0
 .../org/apache/isis/applib}/events/ui/CssClassUiEvent.java  |   0
 .../java/org/apache/isis/applib}/events/ui/IconUiEvent.java |   0
 .../org/apache/isis/applib}/events/ui/LayoutUiEvent.java    |   0
 .../org/apache/isis/applib}/events/ui/TitleUiEvent.java     |   0
 .../isis/applib/jaxbadapters/PersistentEntitiesAdapter.java |   0
 .../isis/applib/jaxbadapters/PersistentEntityAdapter.java   |   0
 .../isis/applib}/layout/component/ActionLayoutData.java     |   0
 .../applib}/layout/component/ActionLayoutDataOwner.java     |   0
 .../isis/applib/layout/component/CollectionLayoutData.java  |   0
 .../applib}/layout/component/CollectionLayoutDataOwner.java |   0
 .../applib}/layout/component/DomainObjectLayoutData.java    |   0
 .../layout/component/DomainObjectLayoutDataOwner.java       |   0
 .../org/apache/isis/applib/layout/component/FieldSet.java   |   0
 .../apache/isis/applib}/layout/component/FieldSetOwner.java |   0
 .../isis/applib}/layout/component/HasBookmarking.java       |   0
 .../apache/isis/applib}/layout/component/HasCssClass.java   |   0
 .../apache/isis/applib}/layout/component/HasCssClassFa.java |   0
 .../isis/applib}/layout/component/HasDescribedAs.java       |   0
 .../org/apache/isis/applib}/layout/component/HasHidden.java |   0
 .../org/apache/isis/applib}/layout/component/HasNamed.java  |   0
 .../apache/isis/applib}/layout/component/MemberRegion.java  |   0
 .../isis/applib}/layout/component/MemberRegionOwner.java    |   0
 .../org/apache/isis/applib}/layout/component/Owned.java     |   0
 .../org/apache/isis/applib}/layout/component/Owner.java     |   0
 .../isis/applib/layout/component/PropertyLayoutData.java    |   0
 .../applib}/layout/component/ServiceActionLayoutData.java   |   0
 .../layout/component/ServiceActionLayoutDataOwner.java      |   0
 .../apache/isis/applib}/layout/component/package-info.java  |   0
 .../main/java/org/apache/isis/applib}/layout/grid/Grid.java |   0
 .../org/apache/isis/applib/layout/grid/GridAbstract.java    |   0
 .../isis/applib}/layout/grid/bootstrap3/BS3ClearFix.java    |   0
 .../applib}/layout/grid/bootstrap3/BS3ClearFixHidden.java   |   0
 .../applib}/layout/grid/bootstrap3/BS3ClearFixVisible.java  |   0
 .../apache/isis/applib/layout/grid/bootstrap3/BS3Col.java   |   0
 .../isis/applib}/layout/grid/bootstrap3/BS3Element.java     |   0
 .../applib}/layout/grid/bootstrap3/BS3ElementAbstract.java  |   0
 .../apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java  |   0
 .../apache/isis/applib/layout/grid/bootstrap3/BS3Row.java   |   0
 .../isis/applib}/layout/grid/bootstrap3/BS3RowContent.java  |   0
 .../applib}/layout/grid/bootstrap3/BS3RowContentOwner.java  |   0
 .../isis/applib}/layout/grid/bootstrap3/BS3RowOwner.java    |   0
 .../apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java   |   0
 .../isis/applib/layout/grid/bootstrap3/BS3TabGroup.java     |   0
 .../applib}/layout/grid/bootstrap3/BS3TabGroupOwner.java    |   0
 .../isis/applib}/layout/grid/bootstrap3/BS3TabOwner.java    |   0
 .../isis/applib}/layout/grid/bootstrap3/HasCssId.java       |   0
 .../apache/isis/applib}/layout/grid/bootstrap3/Size.java    |   0
 .../isis/applib}/layout/grid/bootstrap3/SizeSpan.java       |   0
 .../isis/applib}/layout/grid/bootstrap3/WithinGrid.java     |   0
 .../isis/applib}/layout/grid/bootstrap3/package-info.java   |   0
 .../java/org/apache/isis/applib}/layout/links/Link.java     |   0
 .../org/apache/isis/applib}/layout/links/package-info.java  |   0
 .../java/org/apache/isis/applib}/layout/menubars/Menu.java  |   0
 .../org/apache/isis/applib}/layout/menubars/MenuBar.java    |   0
 .../org/apache/isis/applib}/layout/menubars/MenuBars.java   |   0
 .../isis/applib/layout/menubars/MenuBarsAbstract.java       |   0
 .../apache/isis/applib}/layout/menubars/MenuSection.java    |   0
 .../isis/applib/layout/menubars/bootstrap3/BS3Menu.java     |   0
 .../isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java  |   0
 .../applib}/layout/menubars/bootstrap3/BS3MenuBars.java     |   0
 .../applib/layout/menubars/bootstrap3/BS3MenuSection.java   |   0
 .../applib}/layout/menubars/bootstrap3/package-info.java    |   0
 .../java/org/apache/isis/applib}/layout/package-info.java   |   0
 .../java/org/apache/isis/applib}/mixins/MixinConstants.java |   0
 .../main/java/org/apache/isis/applib}/mixins/dto/Dto.java   |   0
 .../apache/isis/applib}/mixins/dto/DtoMappingHelper.java    |   0
 .../org/apache/isis/applib}/mixins/dto/Dto_downloadXml.java |   0
 .../org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java  |   0
 .../org/apache/isis/applib}/mixins/dto/package-info.java    |   0
 .../applib}/mixins/layout/Object_downloadLayoutXml.java     |   0
 .../isis/applib}/mixins/layout/Object_openRestApi.java      |   0
 .../isis/applib}/mixins/layout/Object_rebuildMetamodel.java |   0
 .../mixins/metamodel/Object_downloadMetaModelXml.java       |   0
 .../applib}/mixins/metamodel/Object_objectIdentifier.java   |   0
 .../isis/applib}/mixins/metamodel/Object_objectType.java    |   0
 .../isis/applib}/mixins/timestamp/HoldsUpdatedAt.java       |   0
 .../isis/applib}/mixins/timestamp/HoldsUpdatedBy.java       |   0
 .../apache/isis/applib}/mixins/timestamp/Timestampable.java |   0
 .../apache/isis/applib}/mixins/timestamp/package-info.java  |   0
 .../src/main/java/org/apache/isis/applib/package-info.java  |   0
 .../src/main/java/org/apache/isis/applib/query/Query.java   |   0
 .../java/org/apache/isis/applib/query/QueryAbstract.java    |   0
 .../java/org/apache/isis/applib/query/QueryDefault.java     |   0
 .../org/apache/isis/applib/query/QueryFindAllInstances.java |   0
 .../java/org/apache/isis/applib/query/package-info.java     |   0
 .../java/org/apache/isis/applib}/security/RoleMemento.java  |   0
 .../java/org/apache/isis/applib}/security/UserMemento.java  |   0
 .../java/org/apache/isis/applib}/security/package-info.java |   0
 .../java/org/apache/isis/applib}/services/HasUniqueId.java  |   0
 .../java/org/apache/isis/applib}/services/HasUsername.java  |   0
 .../services/RepresentsInteractionMemberExecution.java      |   0
 .../apache/isis/applib}/services/WithTransactionScope.java  |   0
 .../applib}/services/acceptheader/AcceptHeaderService.java  |   0
 .../services/appfeat/ApplicationFeatureRepository.java      |   0
 .../applib}/services/appfeat/ApplicationMemberType.java     |   0
 .../apache/isis/applib}/services/appfeat/package-info.java  |   0
 .../applib}/services/audit/AuditEntryPropertyIdType.java    |   0
 .../applib}/services/audit/AuditEntryPropertyValueType.java |   0
 .../apache/isis/applib}/services/audit/AuditerService.java  |   0
 .../isis/applib}/services/audit/AuditerServiceLogging.java  |   0
 .../apache/isis/applib}/services/audit/package-info.java    |   0
 .../services/background/BackgroundCommandService.java       |   0
 .../isis/applib}/services/background/package-info.java      |   0
 .../org/apache/isis/applib}/services/bookmark/Bookmark.java |   0
 .../isis/applib}/services/bookmark/BookmarkHolder.java      |   0
 .../applib}/services/bookmark/BookmarkHolder_lookup.java    |   0
 .../applib}/services/bookmark/BookmarkHolder_object.java    |   0
 .../isis/applib}/services/bookmark/BookmarkService.java     |   0
 .../apache/isis/applib}/services/bookmark/package-info.java |   0
 .../isis/applib}/services/bookmarkui/BookmarkUiService.java |   0
 .../apache/isis/applib}/services/clock/ClockService.java    |   0
 .../apache/isis/applib}/services/clock/package-info.java    |   0
 .../org/apache/isis/applib}/services/command/Command.java   |   0
 .../isis/applib}/services/command/CommandContext.java       |   0
 .../isis/applib}/services/command/CommandDefault.java       |   0
 .../isis/applib}/services/command/CommandDtoProcessor.java  |   0
 .../command/CommandDtoProcessorForActionAbstract.java       |   0
 .../command/CommandDtoProcessorForPropertyAbstract.java     |   0
 .../applib}/services/command/CommandExecutorService.java    |   0
 .../isis/applib}/services/command/CommandWithDto.java       |   0
 .../apache/isis/applib}/services/command/package-info.java  |   0
 .../isis/applib}/services/command/spi/CommandService.java   |   0
 .../isis/applib}/services/confview/ConfigurationMenu.java   |   0
 .../applib}/services/confview/ConfigurationProperty.java    |   0
 .../services/confview/ConfigurationProperty.layout.xml      |   0
 .../applib}/services/confview/ConfigurationProperty.png     | Bin
 .../applib}/services/confview/ConfigurationViewService.java |   0
 .../apache/isis/applib}/services/confview/package-info.java |   0
 .../isis/applib}/services/conmap/ContentMappingService.java |   0
 .../conmap/command/ContentMappingServiceForCommandDto.java  |   0
 .../conmap/command/ContentMappingServiceForCommandsDto.java |   0
 .../conmap/command/spi/CommandDtoProcessorService.java      |   0
 .../apache/isis/applib}/services/conmap/package-info.java   |   0
 .../apache/isis/applib}/services/email/EmailService.java    |   0
 .../apache/isis/applib}/services/email/package-info.java    |   0
 .../apache/isis/applib}/services/error/ErrorDetails.java    |   0
 .../isis/applib}/services/error/ErrorReportingService.java  |   0
 .../java/org/apache/isis/applib}/services/error/Ticket.java |   0
 .../apache/isis/applib}/services/error/package-info.java    |   0
 .../isis/applib}/services/eventbus/EventBusService.java     |   0
 .../apache/isis/applib}/services/eventbus/package-info.java |   0
 .../applib}/services/exceprecog/ExceptionRecognizer.java    |   0
 .../services/exceprecog/ExceptionRecognizerAbstract.java    |   0
 .../services/exceprecog/ExceptionRecognizerComposite.java   |   0
 .../services/exceprecog/ExceptionRecognizerForType.java     |   0
 .../applib}/services/exceprecog/TranslatableException.java  |   0
 .../isis/applib}/services/exceprecog/package-info.java      |   0
 .../isis/applib}/services/factory/FactoryService.java       |   0
 .../apache/isis/applib}/services/factory/package-info.java  |   0
 .../isis/applib}/services/grid/GridLoaderService.java       |   0
 .../org/apache/isis/applib}/services/grid/GridService.java  |   0
 .../isis/applib}/services/grid/GridSystemService.java       |   0
 .../org/apache/isis/applib}/services/grid/package-info.java |   0
 .../org/apache/isis/applib}/services/health/Health.java     |   0
 .../isis/applib}/services/health/HealthCheckService.java    |   0
 .../org/apache/isis/applib}/services/hint/HintStore.java    |   0
 .../org/apache/isis/applib}/services/hint/package-info.java |   0
 .../apache/isis/applib}/services/i18n/LocaleProvider.java   |   0
 .../isis/applib}/services/i18n/TranslatableString.java      |   0
 .../isis/applib}/services/i18n/TranslationService.java      |   0
 .../isis/applib}/services/i18n/TranslationsResolver.java    |   0
 .../org/apache/isis/applib}/services/i18n/package-info.java |   0
 .../org/apache/isis/applib}/services/iactn/Interaction.java |   0
 .../isis/applib}/services/iactn/InteractionContext.java     |   0
 .../apache/isis/applib}/services/iactn/package-info.java    |   0
 .../isis/applib}/services/inject/ServiceInjector.java       |   0
 .../services/jaxb/CatalogingSchemaOutputResolver.java       |   0
 .../org/apache/isis/applib}/services/jaxb/JaxbService.java  |   0
 .../isis/applib}/services/jaxb/JaxbServiceDefault.java      |   0
 .../isis/applib}/services/jaxb/StreamResultWithWriter.java  |   0
 .../org/apache/isis/applib}/services/jaxb/package-info.java |   0
 .../apache/isis/applib}/services/layout/LayoutService.java  |   0
 .../isis/applib}/services/layout/LayoutServiceMenu.java     |   0
 .../apache/isis/applib}/services/layout/package-info.java   |   0
 .../isis/applib}/services/linking/DeepLinkService.java      |   0
 .../apache/isis/applib}/services/linking/package-info.java  |   0
 .../isis/applib}/services/menu/MenuBarsLoaderService.java   |   0
 .../apache/isis/applib}/services/menu/MenuBarsService.java  |   0
 .../isis/applib}/services/message/MessageService.java       |   0
 .../apache/isis/applib}/services/message/package-info.java  |   0
 .../isis/applib}/services/metamodel/DomainMember.java       |   0
 .../apache/isis/applib}/services/metamodel/DomainModel.java |   0
 .../isis/applib}/services/metamodel/MetaModelService.java   |   0
 .../applib}/services/metamodel/MetaModelServicesMenu.java   |   0
 .../isis/applib}/services/metamodel/package-info.java       |   0
 .../isis/applib}/services/metrics/MetricsService.java       |   0
 .../apache/isis/applib}/services/metrics/package-info.java  |   0
 .../java/org/apache/isis/applib}/services/package-info.java |   0
 .../isis/applib}/services/publish/PublishedObjects.java     |   0
 .../isis/applib}/services/publish/PublisherService.java     |   0
 .../applib}/services/publish/PublisherServiceLogging.java   |   0
 .../apache/isis/applib}/services/publish/package-info.java  |   0
 .../services/queryresultscache/QueryResultCacheControl.java |   0
 .../services/queryresultscache/QueryResultsCache.java       |   0
 .../queryresultscache/QueryResultsCacheDefault.java         |   0
 .../applib}/services/queryresultscache/package-info.java    |   0
 .../isis/applib}/services/registry/ServiceRegistry.java     |   0
 .../apache/isis/applib}/services/registry/package-info.java |   0
 .../isis/applib}/services/repository/RepositoryService.java |   0
 .../isis/applib}/services/repository/package-info.java      |   0
 .../isis/applib}/services/routing/RoutingService.java       |   0
 .../apache/isis/applib}/services/routing/package-info.java  |   0
 .../apache/isis/applib}/services/scratchpad/Scratchpad.java |   0
 .../isis/applib}/services/scratchpad/package-info.java      |   0
 .../applib}/services/session/SessionLoggingService.java     |   0
 .../apache/isis/applib}/services/session/package-info.java  |   0
 .../applib}/services/sessmgmt/SessionManagementService.java |   0
 .../apache/isis/applib}/services/sessmgmt/package-info.java |   0
 .../org/apache/isis/applib}/services/sudo/SudoService.java  |   0
 .../org/apache/isis/applib}/services/sudo/package-info.java |   0
 .../isis/applib}/services/swagger/SwaggerService.java       |   0
 .../apache/isis/applib}/services/swagger/package-info.java  |   0
 .../applib}/services/tablecol/TableColumnOrderService.java  |   0
 .../apache/isis/applib}/services/title/TitleService.java    |   0
 .../apache/isis/applib}/services/title/package-info.java    |   0
 .../applib}/services/urlencoding/UrlEncodingService.java    |   0
 .../UrlEncodingServiceUsingBaseEncodingAbstract.java        |   0
 .../urlencoding/UrlEncodingServiceWithCompression.java      |   0
 .../isis/applib}/services/urlencoding/package-info.java     |   0
 .../org/apache/isis/applib}/services/user/UserService.java  |   0
 .../org/apache/isis/applib}/services/user/package-info.java |   0
 .../isis/applib}/services/userprof/UserProfileService.java  |   0
 .../apache/isis/applib}/services/userprof/package-info.java |   0
 .../applib}/services/userreg/EmailNotificationService.java  |   0
 .../apache/isis/applib}/services/userreg/UserDetails.java   |   0
 .../applib}/services/userreg/UserRegistrationService.java   |   0
 .../applib}/services/userreg/events/EmailEventAbstract.java |   0
 .../services/userreg/events/EmailRegistrationEvent.java     |   0
 .../applib}/services/userreg/events/PasswordResetEvent.java |   0
 .../apache/isis/applib}/services/userreg/package-info.java  |   0
 .../org/apache/isis/applib}/services/wrapper/AsyncWrap.java |   0
 .../isis/applib}/services/wrapper/DisabledException.java    |   0
 .../isis/applib}/services/wrapper/HiddenException.java      |   0
 .../isis/applib}/services/wrapper/InteractionException.java |   0
 .../isis/applib}/services/wrapper/InvalidException.java     |   0
 .../isis/applib}/services/wrapper/WrapperFactory.java       |   0
 .../isis/applib}/services/wrapper/WrappingObject.java       |   0
 .../isis/applib}/services/wrapper/events/AccessEvent.java   |   0
 .../services/wrapper/events/ActionArgumentEvent.java        |   0
 .../services/wrapper/events/ActionInvocationEvent.java      |   0
 .../services/wrapper/events/ActionUsabilityEvent.java       |   0
 .../services/wrapper/events/ActionVisibilityEvent.java      |   0
 .../services/wrapper/events/CollectionAccessEvent.java      |   0
 .../services/wrapper/events/CollectionAddToEvent.java       |   0
 .../services/wrapper/events/CollectionMethodEvent.java      |   0
 .../services/wrapper/events/CollectionRemoveFromEvent.java  |   0
 .../services/wrapper/events/CollectionUsabilityEvent.java   |   0
 .../services/wrapper/events/CollectionVisibilityEvent.java  |   0
 .../applib}/services/wrapper/events/InteractionEvent.java   |   0
 .../applib}/services/wrapper/events/ObjectTitleEvent.java   |   0
 .../services/wrapper/events/ObjectValidityEvent.java        |   0
 .../services/wrapper/events/ObjectVisibilityEvent.java      |   0
 .../applib}/services/wrapper/events/ParseValueEvent.java    |   0
 .../services/wrapper/events/PropertyAccessEvent.java        |   0
 .../services/wrapper/events/PropertyModifyEvent.java        |   0
 .../services/wrapper/events/PropertyUsabilityEvent.java     |   0
 .../services/wrapper/events/PropertyVisibilityEvent.java    |   0
 .../services/wrapper/events/ProposedHolderEvent.java        |   0
 .../applib}/services/wrapper/events/UsabilityEvent.java     |   0
 .../isis/applib}/services/wrapper/events/ValidityEvent.java |   0
 .../applib}/services/wrapper/events/VisibilityEvent.java    |   0
 .../isis/applib}/services/wrapper/events/package-info.java  |   0
 .../services/wrapper/listeners/InteractionAdapter.java      |   0
 .../services/wrapper/listeners/InteractionListener.java     |   0
 .../apache/isis/applib}/services/wrapper/package-info.java  |   0
 .../org/apache/isis/applib}/services/xactn/Transaction.java |   0
 .../apache/isis/applib}/services/xactn/TransactionId.java   |   0
 .../isis/applib}/services/xactn/TransactionService.java     |   0
 .../isis/applib}/services/xactn/TransactionState.java       |   0
 .../apache/isis/applib}/services/xactn/package-info.java    |   0
 .../applib}/services/xmlsnapshot/XmlSnapshotService.java    |   0
 .../services/xmlsnapshot/XmlSnapshotServiceAbstract.java    |   0
 .../isis/applib}/services/xmlsnapshot/package-info.java     |   0
 .../isis/applib/snapshot/SnapshottableWithInclusions.java   |   0
 .../java/org/apache/isis/applib/snapshot/package-info.java  |   0
 .../org/apache/isis/applib}/spec/AbstractSpecification.java |   0
 .../apache/isis/applib}/spec/AbstractSpecification2.java    |   0
 .../java/org/apache/isis/applib}/spec/Specification.java    |   0
 .../java/org/apache/isis/applib}/spec/Specification2.java   |   0
 .../java/org/apache/isis/applib}/spec/SpecificationAnd.java |   0
 .../java/org/apache/isis/applib}/spec/SpecificationNot.java |   0
 .../java/org/apache/isis/applib}/spec/SpecificationOr.java  |   0
 .../java/org/apache/isis/applib}/spec/package-info.java     |   0
 .../java/org/apache/isis/applib}/tree/LazyTreeNode.java     |   0
 .../main/java/org/apache/isis/applib}/tree/TreeAdapter.java |   0
 .../main/java/org/apache/isis/applib}/tree/TreeNode.java    |   0
 .../isis/applib}/tree/TreeNode_iteratorBreadthFirst.java    |   0
 .../isis/applib}/tree/TreeNode_iteratorDepthFirst.java      |   0
 .../isis/applib}/tree/TreeNode_iteratorHierarchyUp.java     |   0
 .../main/java/org/apache/isis/applib}/tree/TreePath.java    |   0
 .../java/org/apache/isis/applib}/tree/TreePath_Default.java |   0
 .../main/java/org/apache/isis/applib}/tree/TreeState.java   |   0
 .../org/apache/isis/applib}/tree/TreeState_Default.java     |   0
 .../java/org/apache/isis/applib/types/DescriptionType.java  |   0
 .../org/apache/isis/applib/types/MemberIdentifierType.java  |   0
 .../java/org/apache/isis/applib/types/TargetActionType.java |   0
 .../java/org/apache/isis/applib/types/TargetClassType.java  |   0
 .../java/org/apache/isis/applib/types/package-info.java     |   0
 .../src/main/java/org/apache/isis/applib}/util/Enums.java   |   0
 .../main/java/org/apache/isis/applib}/util/Equality.java    |   0
 .../src/main/java/org/apache/isis/applib}/util/Hashing.java |   0
 .../java/org/apache/isis/applib}/util/JaxbAdapters.java     |   0
 .../main/java/org/apache/isis/applib}/util/JaxbUtil.java    |   0
 .../org/apache/isis/applib}/util/ObjectContract_Empty.java  |   0
 .../org/apache/isis/applib}/util/ObjectContract_Impl.java   |   0
 .../org/apache/isis/applib}/util/ObjectContract_Parser.java |   0
 .../java/org/apache/isis/applib}/util/ObjectContracts.java  |   0
 .../java/org/apache/isis/applib}/util/ReasonBuffer.java     |   0
 .../java/org/apache/isis/applib}/util/ReasonBuffer2.java    |   0
 .../src/main/java/org/apache/isis/applib}/util/Reasons.java |   0
 .../main/java/org/apache/isis/applib}/util/TitleBuffer.java |   0
 .../org/apache/isis/applib}/util/TitleBufferException.java  |   0
 .../main/java/org/apache/isis/applib}/util/ToString.java    |   0
 .../main/java/org/apache/isis/applib/util/ZipWriter.java    |   0
 .../java/org/apache/isis/applib}/util/package-info.java     |   0
 .../apache/isis/applib}/util/schema/ChangesDtoUtils.java    |   0
 .../apache/isis/applib}/util/schema/CommandDtoUtils.java    |   0
 .../org/apache/isis/applib}/util/schema/CommonDtoUtils.java |   0
 .../isis/applib}/util/schema/InteractionDtoUtils.java       |   0
 .../isis/applib}/util/schema/MemberExecutionDtoUtils.java   |   0
 .../src/main/java/org/apache/isis/applib}/value/Blob.java   |   0
 .../java/org/apache/isis/applib}/value/BlobClobFactory.java |   0
 .../src/main/java/org/apache/isis/applib}/value/Clob.java   |   0
 .../src/main/java/org/apache/isis/applib}/value/Image.java  |   0
 .../org/apache/isis/applib}/value/LocalResourcePath.java    |   0
 .../src/main/java/org/apache/isis/applib}/value/Markup.java |   0
 .../org/apache/isis/applib}/value/NamedWithMimeType.java    |   0
 .../main/java/org/apache/isis/applib}/value/Password.java   |   0
 .../java/org/apache/isis/applib}/value/package-info.java    |   0
 .../test/java/org/apache/isis/applib/IdentifierTests.java   |   0
 .../test/java/org/apache/isis/applib/SomeDomainClass.java   |   0
 .../org/apache/isis/applib/events/InteractionEventTest.java |   0
 .../PropertyLayoutData_renderedAsDayBefore_Test.java        |   0
 .../layout/component/PropertyLayoutData_repaint_Test.java   |   0
 .../isis/applib/layout/grid/bootstrap3/BS3ColTest.java      |   0
 .../isis/applib/layout/grid/bootstrap3/SizeSpanTest.java    |   0
 .../menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java     |   0
 .../query/QueryDefaultTest_withStart_or_withCount.java      |   0
 .../applib/services/appfeat/ApplicationMemberTypeTest.java  |   0
 .../services/eventbus/AbstractDomainEvent_veto_Test.java    |   0
 .../exceprecog/ExceptionRecognizerCompositeTest.java        |   0
 .../services/exceprecog/ExceptionRecognizerForTypeTest.java |   0
 .../services/exceprecog/ExceptionRecognizerGeneralTest.java |   0
 .../isis/applib/services/i18n/TranslatableStringTest.java   |   0
 .../services/interaction/InteractionDefaultTest_next.java   |   0
 .../services/metamodel/MetaModelService_Config_Test.java    |   0
 .../queryresultscache/QueryResultsCache_KeyTest.java        |   0
 .../isis/applib/services/urlencoding/MementosTest.java      |   0
 .../applib/services/urlencoding/UrlEncodingServiceTest.java |   0
 .../xmlsnapshot/XmlSnapshotServiceAbstractTest.java         |   0
 .../services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml |   0
 .../apache/isis/applib/spec/AbstractSpecification2Test.java |   0
 .../apache/isis/applib/spec/AbstractSpecificationTest.java  |   0
 .../test/java/org/apache/isis/applib/tree/TreePathTest.java |   0
 .../test/java/org/apache/isis/applib/util/EnumsTest.java    |   0
 .../org/apache/isis/applib/util/EnumsTest_converts.java     |   0
 .../src/test/java/org/apache/isis/applib/util/Invoice.java  |   0
 .../test/java/org/apache/isis/applib/util/InvoiceItem.java  |   0
 .../src/test/java/org/apache/isis/applib/util/Numbered.java |   0
 .../java/org/apache/isis/applib/util/NumberedEvaluator.java |   0
 .../isis/applib/util/ObjectContractsTest_compareTo.java     |   0
 .../apache/isis/applib/util/ObjectContractsTest_equals.java |   0
 .../util/ObjectContractsTest_equals_and_hashCode.java       |   0
 .../isis/applib/util/ObjectContractsTest_toString.java      |   0
 .../java/org/apache/isis/applib/util/ReasonBufferTest.java  |   0
 .../test/java/org/apache/isis/applib/util/ReasonsTest.java  |   0
 .../java/org/apache/isis/applib/util/TitleBufferTest.java   |   0
 .../java/org/apache/isis/applib/util/TitleTestObject.java   |   0
 .../isis/applib/util/schema/CommandDtoUtils_Test.java       |   0
 .../apache/isis/applib/util/schema/CommonDtoUtils_Test.java |   0
 .../applib/util/schema/CommonDtoUtils_setValueOn_Test.java  |   0
 .../InteractionDtoUtilsTest_deriveLogicalMemberId.java      |   0
 .../java/org/apache/isis/applib/util/schema/Roundtrip.java  |   0
 .../java/org/apache/isis/applib/util/schema/Vertical.java   |   0
 .../org/apache/isis/applib/value/BlobTest_constructor.java  |   0
 .../org/apache/isis/applib/value/ClobTest_constructor.java  |   0
 .../java/org/apache/isis/applib/value/PasswordTest.java     |   0
 .../test/java/org/apache/isis/applib/value/TestClock.java   |   0
 {core/applib => api/schema}/.gitignore                      |   0
 {core => api}/schema/pom.xml                                |   0
 {core/applib => api/schema}/src/main/doc/antora.yml         |   0
 .../images/reference-classes/issue-in-more-detail.png       | Bin
 .../images/reference-methods/prefixes/choices/dependent.png | Bin
 .../reference-methods/reserved/cssClass/strikethrough.png   | Bin
 .../reference-methods/reserved/iconName/differing.pdn       | Bin
 .../reference-methods/reserved/iconName/differing.png       | Bin
 .../reference-methods/reserved/iconName/png-files.png       | Bin
 .../main/doc/modules/schema}/images/value-types/markup.png  | Bin
 .../schema/src/main/doc/modules/schema}/nav.adoc            |   0
 .../schema/src/main/doc/modules/schema/pages/about.adoc     |   0
 .../schema/src/main/doc/modules/schema/pages/aim.adoc       |   0
 .../schema/src/main/doc/modules/schema/pages/chg.adoc       |   0
 .../schema/src/main/doc/modules/schema/pages/cmd.adoc       |   0
 .../schema/src/main/doc/modules/schema/pages/common.adoc    |   0
 .../schema/src/main/doc/modules/schema/pages/ixn.adoc       |   0
 .../schema/src/main/doc/modules/schema/pages/mml.adoc       |   0
 .../src/main/doc/modules/schema/partials/module-nav.adoc    |   0
 .../main/java/org/apache/isis/schema/IsisModuleSchema.java  |   0
 .../JavaSqlTimestampXmlGregorianCalendarAdapter.java        |   0
 .../isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java |   0
 .../JodaDateTimeXMLGregorianCalendarAdapter.java            |   0
 .../schema/jaxbadapters/JodaLocalDateStringAdapter.java     |   0
 .../schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java |   0
 .../JodaLocalDateTimeXMLGregorianCalendarAdapter.java       |   0
 .../JodaLocalDateXMLGregorianCalendarAdapter.java           |   0
 .../schema/jaxbadapters/JodaLocalTimeStringAdapter.java     |   0
 .../JodaLocalTimeXMLGregorianCalendarAdapter.java           |   0
 .../java/org/apache/isis/schema/jaxbadapters/Strings.java   |   0
 .../apache/isis/schema/jaxbadapters/XmlCalendarFactory.java |   0
 .../src/main/resources/org/apache/isis/schema/bindings.xml  |   0
 .../main/resources/org/apache/isis/schema/chg/chg-1.1.xsd   |   0
 .../main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd   |   0
 .../resources/org/apache/isis/schema/common/common-1.1.xsd  |   0
 .../main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd   |   0
 .../org/apache/isis/schema/metamodel/metamodel-1.0.xsd      |   0
 core/pom.xml                                                |   5 +++--
 1273 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/schema/.gitignore b/api/applib/.gitignore
similarity index 100%
rename from core/schema/.gitignore
rename to api/applib/.gitignore
diff --git a/core/applib/pom.xml b/api/applib/pom.xml
similarity index 100%
rename from core/applib/pom.xml
rename to api/applib/pom.xml
diff --git a/core/schema/src/main/doc/antora.yml b/api/applib/src/main/doc/antora.yml
similarity index 100%
rename from core/schema/src/main/doc/antora.yml
rename to api/applib/src/main/doc/antora.yml
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples.sh b/api/applib/src/main/doc/modules/applib-ant/examples.sh
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples.sh
rename to api/applib/src/main/doc/modules/applib-ant/examples.sh
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandExecuteIn.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/CommandExecuteIn.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Constants.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Constants.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MementoSerialization.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/MementoSerialization.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/PublishingChangeKind.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/PublishingChangeKind.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
rename to api/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/.gitkeep b/api/applib/src/main/doc/modules/applib-ant/images/.gitkeep
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/.gitkeep
rename to api/applib/src/main/doc/modules/applib-ant/images/.gitkeep
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png b/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
rename to api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
diff --git a/core/schema/src/main/doc/modules/schema/nav.adoc b/api/applib/src/main/doc/modules/applib-ant/nav.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/nav.adoc
rename to api/applib/src/main/doc/modules/applib-ant/nav.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Column.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Column.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Column.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Column.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Title.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/Title.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/Title.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/Title.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc b/api/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc
rename to api/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc
diff --git a/core/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc b/api/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc
rename to api/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples.sh b/api/applib/src/main/doc/modules/applib-cm/examples.sh
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples.sh
rename to api/applib/src/main/doc/modules/applib-cm/examples.sh
diff --git a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java b/api/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/clock/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/clock/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentUsabilityEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentUsabilityEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentVisibilityEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentVisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutDataOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutDataOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutDataOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSetOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSetOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClass.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClass.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClassFa.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClassFa.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasDescribedAs.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasDescribedAs.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/HasNamed.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/HasNamed.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegion.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegion.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegionOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegionOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/Owned.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/Owned.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/Owner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/Owner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutDataOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutDataOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Element.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Element.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContentOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContentOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroupOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroupOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabOwner.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabOwner.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/HasCssId.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/HasCssId.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/links/Link.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/links/Link.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/links/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/links/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/Menu.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/Menu.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBar.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBar.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/MixinConstants.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/MixinConstants.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/security/RoleMemento.java b/api/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/security/RoleMemento.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java b/api/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/security/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/security/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/Specification.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/spec/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeAdapter.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeAdapter.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorBreadthFirst.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorBreadthFirst.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorDepthFirst.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorDepthFirst.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorHierarchyUp.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorHierarchyUp.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreePath.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreePath.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreePath_Default.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreePath_Default.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeState.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeState.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/tree/TreeState_Default.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/tree/TreeState_Default.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/Enums.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/Enums.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/Equality.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/Equality.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/Hashing.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Empty.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Empty.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Impl.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Impl.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/Reasons.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/Reasons.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ToString.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ToString.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Image.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Image.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Markup.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Markup.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/NamedWithMimeType.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/NamedWithMimeType.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Password.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Password.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/package-info.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/package-info.java
rename to api/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png b/api/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png b/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png b/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn b/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png b/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png b/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
rename to api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/schema/src/main/doc/modules/schema/images/value-types/markup.png b/api/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/images/value-types/markup.png
rename to api/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/nav.adoc b/api/applib/src/main/doc/modules/applib-cm/nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/nav.adoc
rename to api/applib/src/main/doc/modules/applib-cm/nav.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/about.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/about.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/about.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/about.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc b/api/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc
rename to api/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc
diff --git a/core/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc b/api/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc
rename to api/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples.sh b/api/applib/src/main/doc/modules/applib-svc/examples.sh
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples.sh
rename to api/applib/src/main/doc/modules/applib-svc/examples.sh
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/HasUniqueId.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/HasUniqueId.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/HasUsername.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/HasUsername.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/WithTransactionScope.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/WithTransactionScope.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureRepository.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureRepository.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/appfeat/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/appfeat/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyIdType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyIdType.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyValueType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyValueType.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/background/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/background/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmarkui/BookmarkUiService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/bookmarkui/BookmarkUiService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/clock/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/clock/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessor.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessor.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForActionAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForActionAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForPropertyAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForPropertyAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandExecutorService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandExecutorService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandWithDto.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/CommandWithDto.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/email/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/error/ErrorReportingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/error/ErrorReportingService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/error/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/error/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/eventbus/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/factory/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/factory/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridLoaderService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/grid/GridLoaderService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/grid/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/health/HealthCheckService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/health/HealthCheckService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/hint/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/hint/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/LocaleProvider.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/i18n/LocaleProvider.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/i18n/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/StreamResultWithWriter.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jaxb/StreamResultWithWriter.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jaxb/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/layout/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/linking/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/linking/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsLoaderService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsLoaderService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/message/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/message/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainModel.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainModel.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metrics/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/metrics/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublishedObjects.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/publish/PublishedObjects.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultCacheControl.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultCacheControl.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/registry/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/registry/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/repository/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/repository/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/routing/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/routing/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/session/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/session/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/SessionManagementService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/SessionManagementService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/sudo/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/sudo/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/swagger/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/title/TitleService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/title/TitleService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/title/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/title/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/user/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/user/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userprof/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userprof/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailEventAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailEventAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailRegistrationEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailRegistrationEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/PasswordResetEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/events/PasswordResetEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/userreg/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/AsyncWrap.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/AsyncWrap.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrappingObject.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrappingObject.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/wrapper/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionId.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionId.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionState.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionState.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xactn/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/package-info.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/package-info.java
rename to api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx b/api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png b/api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx b/api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx
rename to api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx
diff --git a/core/applib/src/main/doc/modules/applib-cm/nav.adoc b/api/applib/src/main/doc/modules/applib-svc/nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/nav.adoc
rename to api/applib/src/main/doc/modules/applib-svc/nav.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/about.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/about.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/about.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/about.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc b/api/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
rename to api/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
diff --git a/core/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc b/api/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc
rename to api/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractService.java b/api/applib/src/main/java/org/apache/isis/applib/AbstractService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/AbstractService.java
rename to api/applib/src/main/java/org/apache/isis/applib/AbstractService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
rename to api/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/ApplicationException.java b/api/applib/src/main/java/org/apache/isis/applib/ApplicationException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/ApplicationException.java
rename to api/applib/src/main/java/org/apache/isis/applib/ApplicationException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/FatalException.java b/api/applib/src/main/java/org/apache/isis/applib/FatalException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/FatalException.java
rename to api/applib/src/main/java/org/apache/isis/applib/FatalException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/Identifier.java
rename to api/applib/src/main/java/org/apache/isis/applib/Identifier.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
rename to api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
rename to api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java b/api/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
rename to api/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/RecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
rename to api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java b/api/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java
rename to api/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/RepositoryException.java b/api/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
rename to api/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/ViewModel.java
rename to api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandExecuteIn.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/CommandExecuteIn.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Constants.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Constants.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MementoSerialization.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/MementoSerialization.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PublishingChangeKind.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PublishingChangeKind.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java b/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
rename to api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java b/api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java
rename to api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/clock/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/clock/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
rename to api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentUsabilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentVisibilityEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
rename to api/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
rename to api/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutDataOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutDataOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSetOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSetOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClass.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClass.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClassFa.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasCssClassFa.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasDescribedAs.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasDescribedAs.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasNamed.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/HasNamed.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegion.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegion.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegionOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/MemberRegionOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/Owned.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/Owned.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/Owner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/Owner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutDataOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutDataOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Element.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Element.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContentOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContentOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowOwner.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroupOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroupOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabOwner.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabOwner.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/HasCssId.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/HasCssId.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java b/api/applib/src/main/java/org/apache/isis/applib/layout/links/Link.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/links/Link.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/links/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/links/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/Menu.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/Menu.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBar.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBar.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/layout/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/MixinConstants.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/MixinConstants.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/Query.java b/api/applib/src/main/java/org/apache/isis/applib/query/Query.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/query/Query.java
rename to api/applib/src/main/java/org/apache/isis/applib/query/Query.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java b/api/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
rename to api/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java b/api/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
rename to api/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/query/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/query/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/query/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java b/api/applib/src/main/java/org/apache/isis/applib/security/RoleMemento.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java
rename to api/applib/src/main/java/org/apache/isis/applib/security/RoleMemento.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java b/api/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java
rename to api/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/security/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/security/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java b/api/applib/src/main/java/org/apache/isis/applib/services/HasUniqueId.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/HasUniqueId.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java b/api/applib/src/main/java/org/apache/isis/applib/services/HasUsername.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/HasUsername.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java b/api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java b/api/applib/src/main/java/org/apache/isis/applib/services/WithTransactionScope.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/WithTransactionScope.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java b/api/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureRepository.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureRepository.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/appfeat/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyIdType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyIdType.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyValueType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditEntryPropertyValueType.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java b/api/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/background/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/background/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmarkui/BookmarkUiService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/bookmarkui/BookmarkUiService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/clock/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/clock/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessor.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessor.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForActionAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForActionAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForPropertyAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandDtoProcessorForPropertyAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandExecutorService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandExecutorService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/CommandWithDto.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/CommandWithDto.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java b/api/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/email/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/email/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java b/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorReportingService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorReportingService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java b/api/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/error/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/error/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java b/api/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/eventbus/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/eventbus/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java b/api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/factory/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/factory/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridLoaderService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/grid/GridLoaderService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/grid/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java b/api/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java b/api/applib/src/main/java/org/apache/isis/applib/services/health/HealthCheckService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/health/HealthCheckService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java b/api/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/hint/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/hint/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/LocaleProvider.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/i18n/LocaleProvider.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/i18n/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java b/api/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/StreamResultWithWriter.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/jaxb/StreamResultWithWriter.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/jaxb/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/layout/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java b/api/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/linking/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/linking/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsLoaderService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsLoaderService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java b/api/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/message/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/message/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainModel.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainModel.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/metrics/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java b/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublishedObjects.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/publish/PublishedObjects.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java b/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java b/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultCacheControl.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultCacheControl.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/registry/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java b/api/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/repository/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/repository/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/routing/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/routing/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/session/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/session/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java b/api/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/SessionManagementService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/SessionManagementService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/sessmgmt/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/sudo/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/swagger/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java b/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java b/api/applib/src/main/java/org/apache/isis/applib/services/title/TitleService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/title/TitleService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/title/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/title/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/user/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/userprof/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userprof/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailEventAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailEventAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailRegistrationEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/EmailRegistrationEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/PasswordResetEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/events/PasswordResetEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/userreg/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/AsyncWrap.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/AsyncWrap.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrappingObject.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrappingObject.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/wrapper/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionId.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionId.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionState.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionState.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xactn/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java b/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java b/api/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
rename to api/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeAdapter.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeAdapter.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorBreadthFirst.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorBreadthFirst.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorDepthFirst.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorDepthFirst.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorHierarchyUp.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode_iteratorHierarchyUp.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreePath.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreePath.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreePath_Default.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreePath_Default.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeState.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeState.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeState_Default.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java
rename to api/applib/src/main/java/org/apache/isis/applib/tree/TreeState_Default.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java b/api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java
rename to api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java b/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
rename to api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java b/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
rename to api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java b/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
rename to api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/types/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/types/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/types/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/types/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Empty.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Empty.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Impl.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Impl.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java b/api/applib/src/main/java/org/apache/isis/applib/util/Reasons.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/Reasons.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java b/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/util/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/package-info.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
rename to api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java b/api/applib/src/main/java/org/apache/isis/applib/value/Blob.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/Blob.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java b/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java b/api/applib/src/main/java/org/apache/isis/applib/value/Clob.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/Clob.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/Image.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java b/api/applib/src/main/java/org/apache/isis/applib/value/NamedWithMimeType.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/NamedWithMimeType.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/Password.java
diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/value/package-info.java
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/value/package-info.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java b/api/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
rename to api/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java b/api/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java
rename to api/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java b/api/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java b/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java b/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java b/api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java b/api/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
rename to api/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java b/api/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java b/api/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java b/api/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
rename to api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
diff --git a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java b/api/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java b/api/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java b/api/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java b/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java b/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/Invoice.java b/api/applib/src/test/java/org/apache/isis/applib/util/Invoice.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/Invoice.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/Invoice.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java b/api/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/Numbered.java b/api/applib/src/test/java/org/apache/isis/applib/util/Numbered.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/Numbered.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/Numbered.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java b/api/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java b/api/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java b/api/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java b/api/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java b/api/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java
rename to api/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java b/api/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java
rename to api/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java b/api/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java
rename to api/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java b/api/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/TestClock.java b/api/applib/src/test/java/org/apache/isis/applib/value/TestClock.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/TestClock.java
rename to api/applib/src/test/java/org/apache/isis/applib/value/TestClock.java
diff --git a/core/applib/.gitignore b/api/schema/.gitignore
similarity index 100%
rename from core/applib/.gitignore
rename to api/schema/.gitignore
diff --git a/core/schema/pom.xml b/api/schema/pom.xml
similarity index 100%
rename from core/schema/pom.xml
rename to api/schema/pom.xml
diff --git a/core/applib/src/main/doc/antora.yml b/api/schema/src/main/doc/antora.yml
similarity index 100%
rename from core/applib/src/main/doc/antora.yml
rename to api/schema/src/main/doc/antora.yml
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png b/api/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
rename to api/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png b/api/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
rename to api/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png b/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
rename to api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn b/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
rename to api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png b/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
rename to api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png b/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
rename to api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png b/api/schema/src/main/doc/modules/schema/images/value-types/markup.png
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png
rename to api/schema/src/main/doc/modules/schema/images/value-types/markup.png
diff --git a/core/applib/src/main/doc/modules/applib-ant/nav.adoc b/api/schema/src/main/doc/modules/schema/nav.adoc
similarity index 100%
rename from core/applib/src/main/doc/modules/applib-ant/nav.adoc
rename to api/schema/src/main/doc/modules/schema/nav.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/about.adoc b/api/schema/src/main/doc/modules/schema/pages/about.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/about.adoc
rename to api/schema/src/main/doc/modules/schema/pages/about.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/aim.adoc b/api/schema/src/main/doc/modules/schema/pages/aim.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/aim.adoc
rename to api/schema/src/main/doc/modules/schema/pages/aim.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/chg.adoc b/api/schema/src/main/doc/modules/schema/pages/chg.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/chg.adoc
rename to api/schema/src/main/doc/modules/schema/pages/chg.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/cmd.adoc b/api/schema/src/main/doc/modules/schema/pages/cmd.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/cmd.adoc
rename to api/schema/src/main/doc/modules/schema/pages/cmd.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/common.adoc b/api/schema/src/main/doc/modules/schema/pages/common.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/common.adoc
rename to api/schema/src/main/doc/modules/schema/pages/common.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/ixn.adoc b/api/schema/src/main/doc/modules/schema/pages/ixn.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/ixn.adoc
rename to api/schema/src/main/doc/modules/schema/pages/ixn.adoc
diff --git a/core/schema/src/main/doc/modules/schema/pages/mml.adoc b/api/schema/src/main/doc/modules/schema/pages/mml.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/pages/mml.adoc
rename to api/schema/src/main/doc/modules/schema/pages/mml.adoc
diff --git a/core/schema/src/main/doc/modules/schema/partials/module-nav.adoc b/api/schema/src/main/doc/modules/schema/partials/module-nav.adoc
similarity index 100%
rename from core/schema/src/main/doc/modules/schema/partials/module-nav.adoc
rename to api/schema/src/main/doc/modules/schema/partials/module-nav.adoc
diff --git a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java b/api/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
rename to api/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java b/api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
similarity index 100%
rename from core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
rename to api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/bindings.xml b/api/schema/src/main/resources/org/apache/isis/schema/bindings.xml
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/bindings.xml
rename to api/schema/src/main/resources/org/apache/isis/schema/bindings.xml
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd b/api/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd b/api/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd b/api/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd b/api/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd b/api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd
similarity index 100%
rename from core/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd
diff --git a/core/pom.xml b/core/pom.xml
index d5896f5..32d5f90 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1842,11 +1842,12 @@
 	
 		<module>../supplemental-model</module>
 
-		<module>schema</module>
+		<module>../api/schema</module>
+		<module>../api/applib</module>
+
 		<module>codegen-bytebuddy</module>
 		<module>commons</module>
 		<module>config</module>
-		<module>applib</module>
 		<module>metamodel</module>
 		<module>runtime</module>
 		<module>runtimeservices</module>


[isis] 08/21: ISIS-2259: moves core/integtestsupport to testing/integtestsupport

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

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

commit 033d444ad27364c707d956b4b4a1916a641bddc8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:42:30 2020 +0000

    ISIS-2259: moves core/integtestsupport to testing/integtestsupport
---
 core/detached-tests/pom.xml                                 |  11 -----------
 core/metamodel/pom.xml                                      |   2 ++
 core/pom.xml                                                |   2 +-
 {core/testsupport => testing}/integtestsupport/pom.xml      |   2 +-
 .../integtestsupport/src/main/doc/antora.yml                |   0
 .../doc/modules/integ-test-support/images/integ-tests.png   | Bin
 .../doc/modules/integ-test-support/images/integ-tests.pptx  | Bin
 .../modules/integ-test-support/images/wrapper-factory.png   | Bin
 .../src/main/doc/modules/integ-test-support/nav.adoc        |   0
 .../main/doc/modules/integ-test-support/pages/about.adoc    |   0
 .../pages/integ-test-support/abstract-class.adoc            |   0
 .../pages/integ-test-support/bootstrapping.adoc             |   0
 .../pages/integ-test-support/configuration-properties.adoc  |   0
 .../pages/integ-test-support/maven-configuration.adoc       |   0
 .../pages/integ-test-support/typical-usage.adoc             |   0
 .../pages/integ-test-support/wrapper-factory.adoc           |   0
 .../doc/modules/integ-test-support/partials/module-nav.adoc |   0
 .../isis/integtestsupport/ExceptionRecognizerTranslate.java |   0
 .../isis/integtestsupport/IsisIntegrationTestAbstract.java  |   0
 .../org/apache/isis/integtestsupport/ThrowableMatchers.java |   0
 .../isis/integtestsupport/validate/ValidateDomainModel.java |   0
 21 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 5ec207f..d2d7664 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -49,11 +49,6 @@
             <artifactId>isis-core-config</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
 			<groupId>org.apache.isis.core</groupId>
@@ -74,12 +69,6 @@
 			<scope>test</scope>
 		</dependency>
         
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-integtestsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
         <!-- core plugins required to run this module's own tests -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index a8c428a..aa2926d 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -109,11 +109,13 @@
             </exclusions>
         </dependency>
 
+<!--
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
+-->
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index e630ad8..8910151 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1855,7 +1855,7 @@
 		<module>webboot-springboot</module>
 
 		<module>testsupport/unittestsupport</module>
-		<module>testsupport/integtestsupport</module>
+		<module>../testing/integtestsupport</module>
 
 		<module>security</module>
 		<module>../security/bypass</module>
diff --git a/core/testsupport/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
similarity index 99%
rename from core/testsupport/integtestsupport/pom.xml
rename to testing/integtestsupport/pom.xml
index af521c4..b72a8a3 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-integtestsupport</artifactId>
diff --git a/core/testsupport/integtestsupport/src/main/doc/antora.yml b/testing/integtestsupport/src/main/doc/antora.yml
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/antora.yml
rename to testing/integtestsupport/src/main/doc/antora.yml
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java


[isis] 19/21: ISIS-2259: minor partial tidy up of detached-tests

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

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

commit 57d16ae498aaae3207002172ca22bab7ca5611b2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:17:41 2020 +0000

    ISIS-2259: minor partial tidy up of detached-tests
---
 .../isis/{ => core}/metamodel/facets/object/mixin/MixinIntendedAs.java | 2 +-
 .../metamodel/facets/object/mixin/MixinIntendedAsActionTest.java       | 3 ++-
 .../{ => core}/metamodel/facets/param/name/ParameterNameFacetTest.java | 2 +-
 .../wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java              | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
index bcae195..8d48977 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.metamodel.facets.object.mixin;
+package org.apache.isis.core.metamodel.facets.object.mixin;
 
 import java.lang.reflect.Method;
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
index 209a924..465a037 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.metamodel.facets.object.mixin;
+package org.apache.isis.core.metamodel.facets.object.mixin;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,6 +32,7 @@ import org.apache.isis.applib.annotation.Collection;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Mixin;
 import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.metamodel.facets.object.mixin.MixinFacet;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index b9aedd3..10ac73d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.metamodel.facets.param.name;
+package org.apache.isis.core.metamodel.facets.param.name;
 
 import java.lang.reflect.Method;
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index 8680278..24ae0df 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.wrapper.proxy;
+package org.apache.isis.core.runtimeservices.wrapper.proxy;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;


[isis] 15/21: ISIS-2259: fixes package for isis-core-commons

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

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

commit c4b62b7e01b32fa000fe5dc2c52b4680c65d2311
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:08:06 2020 +0000

    ISIS-2259: fixes package for isis-core-commons
---
 .../java/org/apache/isis/applib/Identifier.java    |  4 +-
 .../isis/applib/NonRecoverableException.java       |  4 +-
 .../apache/isis/applib/RecoverableException.java   |  4 +-
 .../apache/isis/applib/client/SuppressionType.java |  4 +-
 .../applib/events/domain/AbstractDomainEvent.java  |  4 +-
 .../isis/applib/events/domain/EventObjectBase.java |  4 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.java    |  2 +-
 .../isis/applib/mixins/dto/DtoMappingHelper.java   |  2 +-
 .../apache/isis/applib/query/QueryAbstract.java    |  2 +-
 .../services/appfeat/ApplicationMemberType.java    |  2 +-
 .../isis/applib/services/bookmark/Bookmark.java    |  4 +-
 .../applib/services/bookmark/BookmarkService.java  |  6 +--
 .../services/confview/ConfigurationProperty.java   |  2 +-
 .../services/conmap/ContentMappingService.java     |  2 +-
 .../exceprecog/ExceptionRecognizerAbstract.java    |  4 +-
 .../exceprecog/ExceptionRecognizerComposite.java   |  2 +-
 .../exceprecog/ExceptionRecognizerForType.java     |  6 +--
 .../applib/services/i18n/TranslatableString.java   |  2 +-
 .../isis/applib/services/iactn/Interaction.java    |  4 +-
 .../jaxb/CatalogingSchemaOutputResolver.java       |  4 +-
 .../isis/applib/services/jaxb/JaxbService.java     |  6 +--
 .../applib/services/layout/LayoutServiceMenu.java  |  2 +-
 .../services/metamodel/MetaModelService.java       |  4 +-
 .../services/metamodel/MetaModelServicesMenu.java  |  6 +--
 .../QueryResultsCacheDefault.java                  |  6 +--
 .../applib/services/registry/ServiceRegistry.java  | 12 +++---
 .../applib/services/scratchpad/Scratchpad.java     |  2 +-
 .../services/urlencoding/UrlEncodingService.java   |  4 +-
 ...rlEncodingServiceUsingBaseEncodingAbstract.java |  4 +-
 .../UrlEncodingServiceWithCompression.java         |  4 +-
 .../isis/applib/spec/AbstractSpecification2.java   |  2 +-
 .../org/apache/isis/applib/tree/LazyTreeNode.java  |  4 +-
 .../java/org/apache/isis/applib/tree/TreeNode.java |  2 +-
 .../java/org/apache/isis/applib/util/Enums.java    |  2 +-
 .../java/org/apache/isis/applib/util/Equality.java |  4 +-
 .../java/org/apache/isis/applib/util/Hashing.java  |  2 +-
 .../org/apache/isis/applib/util/JaxbAdapters.java  |  4 +-
 .../java/org/apache/isis/applib/util/JaxbUtil.java |  6 +--
 .../isis/applib/util/ObjectContract_Parser.java    |  4 +-
 .../apache/isis/applib/util/ObjectContracts.java   |  4 +-
 .../org/apache/isis/applib/util/ReasonBuffer2.java |  2 +-
 .../org/apache/isis/applib/util/TitleBuffer.java   |  2 +-
 .../java/org/apache/isis/applib/util/ToString.java |  2 +-
 .../org/apache/isis/applib/util/ZipWriter.java     |  2 +-
 .../isis/applib/util/schema/ChangesDtoUtils.java   |  2 +-
 .../isis/applib/util/schema/CommandDtoUtils.java   |  2 +-
 .../isis/applib/util/schema/CommonDtoUtils.java    | 12 +++---
 .../applib/util/schema/InteractionDtoUtils.java    |  6 +--
 .../util/schema/MemberExecutionDtoUtils.java       |  2 +-
 .../apache/isis/applib/value/BlobClobFactory.java  |  2 +-
 .../applib/services/urlencoding/MementosTest.java  |  8 ++--
 .../XmlSnapshotServiceAbstractTest.java            |  2 +-
 .../ObjectContractsTest_equals_and_hashCode.java   |  2 +-
 core/codegen-bytebuddy/pom.xml                     |  4 +-
 .../bytebuddy/IsisModuleCodegenByteBuddy.java      |  2 +-
 .../services/ProxyFactoryServiceByteBuddy.java     | 12 +++---
 .../commons/internal/exceptions/package-info.java  | 28 -------------
 .../commons/internal/functions/package-info.java   | 28 -------------
 .../commons/internal/memento/package-info.java     | 28 -------------
 .../commons/internal/reflection/package-info.java  | 28 -------------
 .../commons/internal/resources/package-info.java   | 28 -------------
 .../isis/{ => core}/commons/IsisModuleCommons.java |  4 +-
 .../isis/{ => core}/commons/collections/Can.java   |  6 +--
 .../{ => core}/commons/collections/Can_Empty.java  |  4 +-
 .../commons/collections/Can_Multiple.java          |  4 +-
 .../commons/collections/Can_Singleton.java         |  4 +-
 .../commons/collections/Cardinality.java           |  2 +-
 .../commons/concurrent/AwaitableLatch.java         |  4 +-
 .../commons/exceptions/ExceptionUtils.java         |  4 +-
 .../exceptions/IsisApplicationException.java       |  2 +-
 .../commons/exceptions/IsisException.java          |  2 +-
 .../exceptions/UnexpectedCallException.java        |  2 +-
 .../commons/exceptions/UnknownTypeException.java   |  2 +-
 .../commons/exceptions/package-info.java           |  4 +-
 .../commons/handler/ChainOfResponsibility.java     |  2 +-
 .../{ => core}/commons/internal/_Constants.java    |  2 +-
 .../commons/internal/assertions/_Assert.java       |  4 +-
 .../commons/internal/base/_Blackhole.java          |  2 +-
 .../{ => core}/commons/internal/base/_Bytes.java   |  6 +--
 .../internal/base/_Bytes_GZipCompressor.java       |  2 +-
 .../internal/base/_Bytes_GZipCompressorSmart.java  |  4 +-
 .../{ => core}/commons/internal/base/_Casts.java   |  4 +-
 .../{ => core}/commons/internal/base/_Either.java  |  4 +-
 .../{ => core}/commons/internal/base/_Lazy.java    |  2 +-
 .../commons/internal/base/_Lazy_Simple.java        |  4 +-
 .../commons/internal/base/_Lazy_ThreadSafe.java    |  4 +-
 .../commons/internal/base/_NullSafe.java           |  2 +-
 .../commons/internal/base/_Reduction.java          |  4 +-
 .../{ => core}/commons/internal/base/_Strings.java | 18 ++++-----
 .../commons/internal/base/_Strings_FastSplit.java  |  2 +-
 .../internal/base/_Strings_HtmlEscaper.java        |  6 +--
 .../internal/base/_Strings_KeyValuePair.java       | 10 ++---
 .../internal/base/_Strings_NaturalNames.java       |  2 +-
 .../internal/base/_Strings_SplitIterator.java      |  2 +-
 .../{ => core}/commons/internal/base/_Timing.java  |  2 +-
 .../{ => core}/commons/internal/base/_Tuples.java  |  2 +-
 .../{ => core}/commons/internal/base/_With.java    |  2 +-
 .../commons/internal/base}/package-info.java       |  2 +-
 .../commons/internal/collections/_Arrays.java      | 29 +++++++------
 .../internal/collections/_Arrays_Collector.java    |  4 +-
 .../collections/_Arrays_CollectorUnknownSize.java  |  4 +-
 .../commons/internal/collections/_Collections.java | 11 +++--
 .../collections/_Collections_Collector.java        |  8 ++--
 .../collections/_Collections_SortedSetOfList.java  |  2 +-
 .../commons/internal/collections/_Inbox.java       |  2 +-
 .../commons/internal/collections/_Lists.java       | 11 +++--
 .../commons/internal/collections/_Maps.java        | 21 +++++-----
 .../commons/internal/collections/_Multimaps.java   | 19 +++++----
 .../commons/internal/collections/_Sets.java        | 12 +++---
 .../commons/internal/collections/_Streams.java     |  2 +-
 .../internal/collections}/package-info.java        |  2 +-
 .../collections/snapshot/_VersionedList.java       |  6 +--
 .../commons/internal/compare/_Comparators.java     |  2 +-
 .../compare/_Comparators_SequenceCompare.java      |  4 +-
 .../commons/internal/compare}/package-info.java    |  2 +-
 .../internal/concurrent/_ConcurrentContext.java    |  2 +-
 .../internal/concurrent/_ConcurrentTask.java       | 12 +++---
 .../internal/concurrent/_ConcurrentTaskList.java   |  6 +--
 .../commons/internal/context/_Context.java         | 47 +++++++++++-----------
 .../internal/context/_Context_ThreadLocal.java     | 19 +++++----
 .../commons/internal/context/_Plugin.java          | 15 ++++---
 .../commons/internal/context}/package-info.java    |  2 +-
 .../{ => core}/commons/internal/debug/_Probe.java  | 10 ++---
 .../commons/internal/debug/package-info.java       |  2 +-
 .../internal/encoding/DataInputExtended.java       |  2 +-
 .../encoding/DataInputExtendedDecorator.java       |  2 +-
 .../internal/encoding/DataInputStreamExtended.java |  2 +-
 .../internal/encoding/DataOutputExtended.java      |  2 +-
 .../encoding/DataOutputExtendedDecorator.java      |  2 +-
 .../encoding/DataOutputStreamExtended.java         |  2 +-
 .../internal/encoding/DebugDataInputExtended.java  |  2 +-
 .../internal/encoding/DebugDataOutputExtended.java |  2 +-
 .../commons/internal/encoding/Encodable.java       |  2 +-
 .../internal/encoding/EncodingConstants.java       |  2 +-
 .../internal/encoding/FailedToDecodeException.java |  2 +-
 .../encoding/FailedToDeserializeException.java     |  2 +-
 .../commons/internal/encoding/FieldType.java       |  4 +-
 .../internal/environment/DeploymentType.java       |  2 +-
 .../environment/IsisSystemEnvironment.java         |  8 ++--
 .../commons/internal/exceptions/_Exceptions.java   | 36 ++++++++---------
 .../commons/internal/exceptions}/package-info.java |  2 +-
 .../factory/InstanceCreationClassException.java    |  4 +-
 .../factory/InstanceCreationException.java         |  4 +-
 .../commons/internal/factory/InstanceUtil.java     |  8 ++--
 .../factory/UnavailableClassException.java         |  4 +-
 .../commons/internal/factory/package-info.java     |  4 +-
 .../commons/internal/functions/_Functions.java     |  2 +-
 .../_Functions_IndexAwareFunctionAdapter.java      |  4 +-
 .../commons/internal/functions/_Predicates.java    |  4 +-
 .../commons/internal/functions}/package-info.java  |  2 +-
 .../{ => core}/commons/internal/ioc/BeanSort.java  |  2 +-
 .../commons/internal/ioc/IocContainer.java         |  6 +--
 .../commons/internal/ioc/ManagedBeanAdapter.java   |  4 +-
 .../commons/internal/ioc/PriorityConstants.java    |  2 +-
 .../commons/internal/ioc/cdi/BeanAdapterCDI.java   |  6 +--
 .../commons/internal/ioc/cdi/CdiPlugin.java        |  4 +-
 .../{ => core}/commons/internal/ioc/cdi/_CDI.java  | 25 ++++++------
 .../commons/internal/ioc/cdi/_CDI_Lifecycle.java   |  4 +-
 .../internal/ioc/spring/BeanAdapterSpring.java     |  6 +--
 .../commons/internal/ioc/spring/EventSpring.java   |  4 +-
 .../internal/ioc/spring/IocContainerSpring.java    | 19 +++++----
 .../commons/internal/ioc/spring/_Spring.java       | 10 ++---
 .../commons/internal/memento/_Mementos.java        |  6 +--
 .../internal/memento/_Mementos_MementoDefault.java | 31 +++++++-------
 .../commons/internal/memento}/package-info.java    |  2 +-
 .../{ => core}/commons/internal/package-info.java  |  2 +-
 .../internal/plugins/PluginResolveException.java   |  2 +-
 .../internal/plugins/codegen/ProxyFactory.java     |  2 +-
 .../plugins/codegen/ProxyFactoryService.java       |  2 +-
 .../plugins/ioc/ConversationContextHandle.java     |  2 +-
 .../plugins/ioc/ConversationContextService.java    |  2 +-
 .../ioc/ConversationContextServiceDefault.java     |  2 +-
 .../commons/internal/reflection/_Annotations.java  |  4 +-
 .../internal/reflection/_AnnotationsLegacy.java    | 13 +++---
 .../reflection/_Annotations_AttributeMethods.java  |  2 +-
 .../reflection/_Annotations_SyntCache.java         |  4 +-
 ...nthesizedMergedAnnotationInvocationHandler.java |  4 +-
 .../commons/internal/reflection/_MethodCache.java  | 11 +++--
 .../commons/internal/reflection/_Reflect.java      | 31 +++++++-------
 .../commons/internal/reflection}/package-info.java |  2 +-
 .../commons/internal/resources/_Json.java          |  4 +-
 .../commons/internal/resources/_Resources.java     | 19 +++++----
 .../commons/internal/resources}/package-info.java  |  2 +-
 .../commons/internal/url/UrlDecoderUtil.java       |  2 +-
 .../handlers/ChainOfResponsibilityTest.java        |  4 +-
 .../commons/internal/base/BytesTest.java           |  4 +-
 .../commons/internal/base/NullSafeTest.java        |  2 +-
 .../commons/internal/base/ReductionTest.java       |  4 +-
 .../commons/internal/base/StringsTest.java         |  4 +-
 .../{ => core}/commons/internal/cdi/CDITest.java   |  7 ++--
 .../internal/cdi/ValidQualifierForTesting.java     |  2 +-
 .../commons/internal/collections/_ArraysTest.java  |  2 +-
 .../commons/internal/collections/_MapsTest.java    |  4 +-
 .../collections/snapshot/VersionedListTest.java    |  2 +-
 .../commons/internal/compare/ComparatorsTest.java  |  4 +-
 .../concurrent/ConcurrentTaskListTest.java         |  2 +-
 .../commons/internal/context/ContextTest.java      |  2 +-
 .../encoding/ByteEncoderDecoderRoundtripTest.java  |  2 +-
 .../commons/internal/resources/ResourcesTest.java  |  2 +-
 .../commons/internal/strings/FormatTest.java       |  2 +-
 .../apache/isis/config/ConfigurationConstants.java |  2 +-
 .../org/apache/isis/config/IsisConfiguration.java  |  4 +-
 .../org/apache/isis/config/IsisModuleConfig.java   |  2 +-
 .../isis/config/beans/IsisBeanTypeRegistry.java    | 16 ++++----
 .../org/apache/isis/config/beans/TypeMetaData.java |  6 +--
 .../isis/config/messages/MessageRegistry.java      |  2 +-
 .../metamodel/specloader/IntrospectionMode.java    |  4 +-
 .../org/apache/isis/config/util/ConfigUtil.java    |  2 +-
 .../config/viewer/wicket/WebAppContextPath.java    |  4 +-
 .../commons/internal/reflection/ReflectTest.java   | 10 ++---
 .../BidirectionalRelationshipContractTestAll.java  |  2 +-
 .../comparable/CategorizedDomainObject.java        |  2 +-
 .../ImposteriserTestUsingCodegenPlugin.java        |  2 +-
 .../adapter/oid/ObjectPersistenceException.java    |  2 +-
 .../isis/metamodel/adapter/oid/Oid_Marshaller.java | 12 +++---
 .../isis/metamodel/adapter/oid/Oid_Parented.java   |  2 +-
 .../isis/metamodel/adapter/oid/Oid_Root.java       |  4 +-
 .../isis/metamodel/adapter/oid/ParentedOid.java    |  2 +-
 .../apache/isis/metamodel/adapter/oid/RootOid.java |  2 +-
 .../isis/metamodel/commons/ArrayExtensions.java    |  2 +-
 .../isis/metamodel/commons/ClassExtensions.java    |  8 ++--
 .../apache/isis/metamodel/commons/ClassUtil.java   | 12 +++---
 .../isis/metamodel/commons/ListExtensions.java     |  6 +--
 .../apache/isis/metamodel/commons/LocaleUtil.java  |  2 +-
 .../commons/MethodInvocationPreprocessor.java      | 10 ++---
 .../isis/metamodel/commons/ObjectExtensions.java   |  2 +-
 .../isis/metamodel/commons/ResourceUtil.java       |  2 +-
 .../isis/metamodel/commons/StringExtensions.java   |  4 +-
 .../metamodel/commons/ThrowableExtensions.java     |  2 +-
 .../isis/metamodel/consent/InteractionAdvisor.java |  2 +-
 .../org/apache/isis/metamodel/consent/Veto.java    |  2 +-
 .../isis/metamodel/context/MetaModelContext.java   |  3 +-
 .../context/MetaModelContext_usingIoc.java         | 11 +++--
 .../isis/metamodel/context/MetaModelContexts.java  |  2 +-
 .../metamodel/exceptions/MetaModelException.java   |  2 +-
 .../persistence/ObjectPersistenceException.java    |  2 +-
 .../isis/metamodel/facetapi/FacetAbstract.java     |  6 +--
 .../isis/metamodel/facetapi/FacetHolderImpl.java   | 10 ++---
 .../apache/isis/metamodel/facets/Annotations.java  | 12 +++---
 .../isis/metamodel/facets/CollectionUtils.java     | 10 ++---
 .../isis/metamodel/facets/DependentArgUtils.java   |  4 +-
 .../isis/metamodel/facets/DomainEventHelper.java   |  6 +--
 .../apache/isis/metamodel/facets/FacetFactory.java |  4 +-
 .../isis/metamodel/facets/FacetedMethod.java       |  4 +-
 .../isis/metamodel/facets/ImperativeFacet.java     |  2 +-
 .../isis/metamodel/facets/MethodFinderUtils.java   |  2 +-
 .../facets/MethodPrefixBasedFacetFactory.java      |  2 +-
 .../MethodPrefixBasedFacetFactoryAbstract.java     |  4 +-
 .../facets/OrphanedSupportingMethodValidator.java  |  4 +-
 ...rCollectionIdentifyingFacetFactoryAbstract.java |  4 +-
 .../facets/actcoll/typeof/TypeOfFacet.java         |  4 +-
 .../action/ActionAnnotationFacetFactory.java       |  4 +-
 .../action/invocation/ActionInvocationFacet.java   |  1 -
 ...ctionInvocationFacetForDomainEventAbstract.java | 12 +++---
 .../actions/action/invocation/CommandUtil.java     |  5 +--
 .../PrototypeFacetForActionAnnotation.java         |  2 +-
 .../ActionDefaultsFacetViaMethodFactory.java       |  4 +-
 .../FileAcceptFacetForActionAnnotation.java        |  2 +-
 .../annotation/HomePageFacetAnnotationFactory.java |  4 +-
 .../CssClassFaFacetForActionLayoutAnnotation.java  |  2 +-
 .../layout/CssClassFaFacetForActionXml.java        |  2 +-
 .../CssClassFacetForActionLayoutAnnotation.java    |  2 +-
 .../actions/layout/CssClassFacetForActionXml.java  |  2 +-
 .../DescribedAsFacetForActionLayoutAnnotation.java |  2 +-
 .../layout/DescribedAsFacetForActionXml.java       |  2 +-
 .../NamedFacetForActionLayoutAnnotation.java       |  2 +-
 .../actions/layout/NamedFacetForActionXml.java     |  2 +-
 .../actions/prototype/PrototypeFacetAbstract.java  |  2 +-
 .../actions/validate/ActionValidationFacet.java    |  1 -
 .../method/ActionValidationFacetViaMethod.java     |  1 -
 .../ActionValidationFacetViaMethodFactory.java     |  2 +-
 .../facets/all/deficiencies/DeficiencyFacet.java   |  4 +-
 .../facets/all/i18n/TranslationFacetFactory.java   |  2 +-
 .../CollectionAccessorFacetViaAccessor.java        |  2 +-
 .../CollectionAccessorFacetViaAccessorFactory.java |  2 +-
 .../clear/CollectionClearFacetFactory.java         |  2 +-
 .../CollectionAnnotationFacetFactory.java          |  2 +-
 ...ectionAddToFacetForDomainEventFromAbstract.java |  2 +-
 .../modify/CollectionDomainEventFacetAbstract.java |  2 +-
 ...nRemoveFromFacetForDomainEventFromAbstract.java |  4 +-
 .../javautilcollection/CollectionFacetFactory.java |  4 +-
 .../javautilcollection/JavaArrayFacet.java         |  6 +--
 .../javautilcollection/JavaCollectionFacet.java    |  2 +-
 ...CssClassFacetForCollectionLayoutAnnotation.java |  2 +-
 .../layout/CssClassFacetForCollectionXml.java      |  2 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |  2 +-
 .../layout/DefaultViewFacetForCollectionXml.java   |  2 +-
 ...cribedAsFacetForCollectionLayoutAnnotation.java |  2 +-
 .../layout/DescribedAsFacetForCollectionXml.java   |  2 +-
 .../NamedFacetForCollectionLayoutAnnotation.java   |  2 +-
 .../layout/NamedFacetForCollectionXml.java         |  2 +-
 ...SortedByFacetForCollectionLayoutAnnotation.java |  2 +-
 .../layout/SortedByFacetForCollectionXml.java      |  2 +-
 ...tionAddToRemoveFromAndValidateFacetFactory.java |  2 +-
 .../facets/collections/modify/CollectionFacet.java |  2 +-
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  2 +-
 .../cssclassfa/CssClassFaFacetAbstract.java        |  4 +-
 .../cssclassfa/annotprop/MixinInterceptor.java     |  2 +-
 .../disabled/DisabledFacetAbstractImpl.java        |  2 +-
 .../method/DisableForContextFacetViaMethod.java    |  2 +-
 .../DisableForContextFacetViaMethodFactory.java    |  2 +-
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |  2 +-
 .../method/HideForContextFacetViaMethod.java       |  2 +-
 .../HideForContextFacetViaMethodFactory.java       |  2 +-
 .../members/order/MemberOrderFacetAbstract.java    |  2 +-
 .../callbacks/CreatedCallbackFacetFactory.java     |  2 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 .../object/callbacks/LoadCallbackFacetFactory.java |  4 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 .../callbacks/PersistCallbackFacetFactory.java     |  4 +-
 .../PersistCallbackViaSaveMethodFacetFactory.java  |  4 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 .../callbacks/RemoveCallbackFacetFactory.java      |  4 +-
 .../RemoveCallbackViaDeleteMethodFacetFactory.java |  4 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 .../callbacks/UpdateCallbackFacetFactory.java      |  4 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 .../callbacks/UpdatingCallbackFacetViaMethod.java  |  2 +-
 ...fecycleEventFacetForDomainObjectAnnotation.java |  2 +-
 ...ingValueFacetUsingSemanticsProviderFactory.java |  2 +-
 .../method/CssClassFacetMethodFactory.java         |  2 +-
 ...ssClassFaFacetForDomainObjectLayoutFactory.java |  2 +-
 .../CssClassFaFacetForViewModelLayoutFactory.java  |  2 +-
 .../object/defaults/DefaultsProviderUtil.java      |  2 +-
 .../annotcfg/DefaultedFacetAnnotation.java         |  2 +-
 ...tedFacetAnnotationElseConfigurationFactory.java |  2 +-
 .../DisabledObjectFacetViaMethodFactory.java       |  2 +-
 .../DomainObjectAnnotationFacetFactory.java        |  2 +-
 .../AuditableFacetForDomainObjectAnnotation.java   |  2 +-
 .../ImmutableFacetForDomainObjectAnnotation.java   |  4 +-
 .../editing/ImmutableFacetFromConfiguration.java   |  2 +-
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |  2 +-
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |  2 +-
 .../CssClassFaFacetForDomainObjectXml.java         |  2 +-
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |  2 +-
 ...sClassFacetForDomainObjectLayoutAnnotation.java |  2 +-
 .../CssClassFacetForDomainObjectXml.java           |  2 +-
 .../CssClassFacetForViewModelLayoutAnnotation.java |  2 +-
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  2 +-
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  2 +-
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |  2 +-
 .../DescribedAsFacetForDomainObjectXml.java        |  2 +-
 ...scribedAsFacetForViewModelLayoutAnnotation.java |  2 +-
 .../DomainObjectLayoutFacetFactory.java            |  2 +-
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  2 +-
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  2 +-
 .../NamedFacetForDomainObjectLayoutAnnotation.java |  2 +-
 .../NamedFacetForDomainObjectXml.java              |  2 +-
 .../NamedFacetForViewModelLayoutAnnotation.java    |  2 +-
 .../PluralFacetForDomainObjectXml.java             |  2 +-
 .../PluralFacetForViewModelLayoutAnnotation.java   |  2 +-
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  2 +-
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  2 +-
 .../DomainServiceLayoutFacetFactory.java           |  2 +-
 .../encoder/EncodableFacetUsingEncoderDecoder.java |  2 +-
 .../facets/object/facets/FacetsFacetAbstract.java  |  4 +-
 .../facets/object/grid/GridFacetFactory.java       |  2 +-
 .../method/HiddenObjectFacetViaMethodFactory.java  |  2 +-
 .../object/icon/method/IconFacetMethodFactory.java |  2 +-
 .../RemoveAnnotatedMethodsFacetFactory.java        |  6 +--
 ...oveDatanucleusPersistableTypesFacetFactory.java |  4 +-
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  4 +-
 .../jdo/RemoveJdoEnhancementTypesFacetFactory.java |  4 +-
 .../facets/object/layout/LayoutFacetFactory.java   |  2 +-
 .../mixin/MetaModelValidatorForMixinTypes.java     |  2 +-
 .../mixin/MixinFacetForDomainObjectAnnotation.java |  2 +-
 .../object/mixin/MixinFacetForMixinAnnotation.java |  2 +-
 .../NavigableParentAnnotationFacetFactory.java     |  2 +-
 .../method/NavigableParentFacetMethod.java         |  2 +-
 .../object/parseable/InvalidEntryException.java    |  2 +-
 .../facets/object/parseable/ParserUtil.java        |  2 +-
 .../object/parseable/TextEntryParseException.java  |  2 +-
 ...ObjectFacetDeclarativeInitializingAbstract.java |  4 +-
 .../recreatable/RecreatableObjectFacetFactory.java |  2 +-
 .../annotation/TitleAnnotationFacetFactory.java    |  4 +-
 .../annotation/TitleFacetViaTitleAnnotation.java   |  4 +-
 .../title/methods/TitleFacetViaMethodsFactory.java |  4 +-
 .../method/ValidateObjectFacetMethodFactory.java   |  2 +-
 .../value/annotcfg/ValueFacetAnnotation.java       |  2 +-
 ...ValueFacetAnnotationOrConfigurationFactory.java |  2 +-
 .../ValueSemanticsProviderAndFacetAbstract.java    |  2 +-
 .../value/vsp/ValueSemanticsProviderUtil.java      |  4 +-
 .../mandatory/MandatoryFacetAbstract.java          |  2 +-
 .../MustSatisfySpecificationFacetAbstract.java     |  2 +-
 .../ActionParameterAutoCompleteFacet.java          |  1 -
 .../ActionParameterAutoCompleteFacetViaMethod.java |  4 +-
 ...ParameterAutoCompleteFacetViaMethodFactory.java |  2 +-
 .../param/choices/ActionParameterChoicesFacet.java |  1 -
 .../choices/ActionParameterChoicesFacetNone.java   |  1 -
 ...rameterChoicesFacetDerivedFromChoicesFacet.java |  3 +-
 .../method/ActionChoicesFacetViaMethod.java        |  2 +-
 .../method/ActionChoicesFacetViaMethodFactory.java |  4 +-
 .../ActionParameterChoicesFacetViaMethod.java      |  4 +-
 ...ctionParameterChoicesFacetViaMethodFactory.java |  2 +-
 .../defaults/ActionParameterDefaultsFacet.java     |  1 -
 .../ActionParameterDefaultsFacetViaMethod.java     |  1 -
 ...tionParameterDefaultsFacetViaMethodFactory.java |  4 +-
 .../disable/ActionParameterDisabledFacet.java      |  1 -
 .../ActionParameterDisabledFacetViaMethod.java     |  1 -
 ...tionParameterDisabledFacetViaMethodFactory.java |  2 +-
 .../param/hide/ActionParameterHiddenFacet.java     |  1 -
 .../ActionParameterHiddenFacetViaMethod.java       |  1 -
 ...ActionParameterHiddenFacetViaMethodFactory.java |  2 +-
 .../CssClassFacetForParameterLayoutAnnotation.java |  2 +-
 ...scribedAsFacetForParameterLayoutAnnotation.java |  2 +-
 .../NamedFacetForParameterLayoutAnnotation.java    |  2 +-
 .../FileAcceptFacetForParameterAnnotation.java     |  2 +-
 .../regex/RegExFacetForParameterAnnotation.java    |  2 +-
 .../RegExFacetForPatternAnnotationOnParameter.java |  2 +-
 ...onParameterValidationFacetViaMethodFactory.java |  2 +-
 .../PropertyAccessorFacetViaAccessorFactory.java   |  4 +-
 .../method/PropertyAutoCompleteFacetMethod.java    |  2 +-
 .../PropertyAutoCompleteFacetMethodFactory.java    |  2 +-
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |  2 +-
 .../PropertyChoicesFacetViaMethodFactory.java      |  2 +-
 .../method/PropertyDefaultFacetViaMethod.java      |  2 +-
 .../PropertyDefaultFacetViaMethodFactory.java      |  2 +-
 .../FileAcceptFacetForPropertyAnnotation.java      |  2 +-
 .../modify/PropertyDomainEventFacetAbstract.java   |  2 +-
 ...tySetterOrClearFacetForDomainEventAbstract.java |  4 +-
 .../RegExFacetForPatternAnnotationOnProperty.java  |  2 +-
 .../regex/RegExFacetForPropertyAnnotation.java     |  2 +-
 .../CssClassFacetForPropertyLayoutAnnotation.java  |  2 +-
 .../CssClassFacetForPropertyXml.java               |  2 +-
 ...escribedAsFacetForPropertyLayoutAnnotation.java |  2 +-
 .../DescribedAsFacetForPropertyXml.java            |  2 +-
 .../NamedFacetForPropertyLayoutAnnotation.java     |  2 +-
 .../propertylayout/NamedFacetForPropertyXml.java   |  2 +-
 .../update/PropertyModifyFacetFactory.java         |  2 +-
 .../update/PropertySetAndClearFacetFactory.java    |  4 +-
 .../PropertyValidateFacetViaMethodFactory.java     |  2 +-
 .../DateAndTimeValueSemanticsProviderAbstract.java |  2 +-
 .../ValueSemanticsProviderAbstractTemporal.java    |  4 +-
 .../BigDecimalValueSemanticsProvider.java          |  2 +-
 .../value/blobs/BlobValueSemanticsProvider.java    |  4 +-
 .../BooleanValueSemanticsProviderAbstract.java     |  2 +-
 .../date/DateValueSemanticsProviderAbstract.java   |  2 +-
 .../Jdk8LocalDateValueSemanticsProvider.java       |  4 +-
 .../value/datejodalocal/JodaLocalDateUtil.java     |  2 +-
 .../JodaLocalDateValueSemanticsProvider.java       |  4 +-
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  4 +-
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  2 +-
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  2 +-
 .../datetimejodalocal/JodaLocalDateTimeUtil.java   |  2 +-
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  4 +-
 .../image/ImageValueSemanticsProviderAbstract.java |  4 +-
 .../timesql/JavaSqlTimeValueSemanticsProvider.java |  2 +-
 .../JavaSqlTimeStampValueSemanticsProvider.java    |  2 +-
 .../treenode/TreeNodeValueSemanticsProvider.java   |  6 +--
 .../metamodel/interactions/InteractionContext.java |  4 +-
 .../isis/metamodel/layout/DeweyOrderSet.java       |  6 +--
 .../MemberOrderFacetComparator.java                |  2 +-
 .../objectmanager/create/ObjectCreator.java        |  6 +--
 .../create/ObjectCreator_builtinHandlers.java      |  6 +--
 .../objectmanager/identify/ObjectIdentifier.java   |  6 +--
 .../identify/ObjectIdentifier_builtinHandlers.java |  2 +-
 .../metamodel/objectmanager/load/ObjectLoader.java |  6 +--
 .../load/ObjectLoader_builtinHandlers.java         |  6 +--
 .../objectmanager/refresh/ObjectRefresher.java     |  6 +--
 .../refresh/ObjectRefresher_builtinHandlers.java   |  2 +-
 ...meterDefaultsFacetFromAssociatedCollection.java |  2 +-
 .../param/DeriveFacetsPostProcessor.java           |  4 +-
 .../isis/metamodel/progmodel/ProgrammingModel.java |  2 +-
 .../progmodel/ProgrammingModelAbstract.java        |  8 ++--
 .../progmodel/ProgrammingModelInitFilter.java      |  4 +-
 .../dflt/ProgrammingModelFacetsJava8.java          |  2 +-
 .../metamodel/services/ServiceInjectorLegacy.java  | 10 ++---
 .../isis/metamodel/services/ServiceUtil.java       |  2 +-
 .../services/appfeat/ApplicationFeature.java       |  2 +-
 .../services/appfeat/ApplicationFeatureId.java     |  6 +--
 .../ApplicationFeatureRepositoryDefault.java       | 10 ++---
 .../classsubstitutor/ClassSubstitutorAbstract.java |  4 +-
 .../classsubstitutor/ClassSubstitutorRegistry.java |  2 +-
 .../command/CommandDtoServiceInternal.java         |  1 -
 .../events/MetamodelEventSupport_Spring.java       |  2 +-
 .../services/grid/GridLoaderServiceDefault.java    |  8 ++--
 .../services/grid/GridReaderUsingJaxb.java         |  4 +-
 .../services/grid/GridServiceDefault.java          |  6 +--
 .../services/grid/GridSystemServiceAbstract.java   |  8 ++--
 .../grid/bootstrap3/GridSystemServiceBS3.java      | 14 +++----
 .../services/homepage/HomePageAction.java          |  1 -
 .../ixn/InteractionDtoServiceInternal.java         |  1 -
 .../services/layout/LayoutServiceDefault.java      |  4 +-
 .../services/metamodel/DomainMemberDefault.java    |  6 +--
 .../services/metamodel/DomainModelDefault.java     |  2 +-
 .../services/metamodel/MetaModelExporter.java      |  6 +--
 .../metamodel/MetaModelServiceDefault.java         |  4 +-
 .../services/registry/ServiceRegistryDefault.java  | 14 +++----
 .../title/TitlesAndTranslationsValidator.java      |  2 +-
 .../services/user/UserServiceDefault.java          |  2 +-
 .../isis/metamodel/spec/DomainModelException.java  |  2 +-
 .../apache/isis/metamodel/spec/ManagedObject.java  | 10 ++---
 .../apache/isis/metamodel/spec/ObjectSpecId.java   |  2 +-
 .../isis/metamodel/spec/ObjectSpecification.java   |  7 ++--
 .../isis/metamodel/spec/feature/ObjectAction.java  | 10 ++---
 .../spec/feature/ObjectActionContainer.java        |  4 +-
 .../spec/feature/ObjectActionParameter.java        |  2 +-
 .../metamodel/spec/feature/ObjectAssociation.java  |  8 ++--
 .../isis/metamodel/spec/feature/ObjectMember.java  |  2 +-
 .../isis/metamodel/specloader/CollectionUtils.java |  4 +-
 .../specloader/ProgrammingModelServiceDefault.java |  2 +-
 .../specloader/ReflectiveActionException.java      |  2 +-
 .../specloader/SpecificationCacheDefault.java      |  4 +-
 .../specloader/SpecificationLoaderDefault.java     | 14 +++----
 .../specloader/facetprocessor/FacetProcessor.java  | 12 +++---
 .../specloader/specimpl/FacetedMethodsBuilder.java |  8 ++--
 .../metamodel/specloader/specimpl/Factories.java   |  2 +-
 .../specimpl/ObjectActionContributee.java          |  4 +-
 .../specloader/specimpl/ObjectActionDefault.java   | 10 ++---
 .../specloader/specimpl/ObjectActionMixedIn.java   |  6 +--
 .../specimpl/ObjectActionParameterAbstract.java    |  8 ++--
 .../ObjectActionParameterContributeeAbstract.java  |  3 +-
 .../ObjectActionParameterMixedInAbstract.java      |  2 +-
 .../specimpl/ObjectSpecificationAbstract.java      | 24 +++++------
 .../specimpl/OneToManyAssociationContributee.java  |  3 +-
 .../specimpl/OneToManyAssociationDefault.java      |  2 +-
 .../specimpl/OneToManyAssociationMixedIn.java      |  2 +-
 .../specimpl/OneToOneAssociationContributee.java   |  3 +-
 .../specimpl/OneToOneAssociationDefault.java       |  4 +-
 .../specimpl/OneToOneAssociationMixedIn.java       |  3 +-
 .../isis/metamodel/specloader/specimpl/Utils.java  |  4 +-
 .../specimpl/dflt/ObjectSpecificationDefault.java  | 10 ++---
 .../CollectionFacetOnStandaloneList.java           |  4 +-
 .../ObjectSpecificationOnStandaloneList.java       |  8 ++--
 .../specloader/validator/ValidationFailures.java   |  4 +-
 .../isis/metamodel/util/DeweyOrderComparator.java  |  2 +-
 .../isis/metamodel/util/snapshot/XmlSnapshot.java  |  4 +-
 .../metamodel/MetaModelContext_forTesting.java     |  6 +--
 .../isis/metamodel/ServiceRegistry_forTesting.java | 18 ++++-----
 .../metamodel/commons/ListUtilsTest_insert.java    |  2 +-
 .../Annotations_getAnnotations_on_Class_Test.java  |  2 +-
 .../Annotations_getAnnotations_on_Field_Test.java  |  2 +-
 .../Annotations_getAnnotations_on_Method_Test.java |  2 +-
 ...notations_getAnnotations_on_Parameter_Test.java |  2 +-
 .../isis/metamodel/facets/CollectionUtilsTest.java |  2 +-
 .../metamodel/facets/MethodFinderUtilsTest.java    |  2 +-
 .../org/apache/isis/metamodel/facets/Utils.java    |  2 +-
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  2 +-
 .../prototype/PrototypeFacetAbstractTest.java      |  2 +-
 ...etForCollectionLayoutAnnotationFactoryTest.java |  2 +-
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  2 +-
 .../TitleFacetViaTitleAnnotationTest.java          |  2 +-
 .../NavigableParentAnnotationFacetFactoryTest.java |  2 +-
 .../ordering/memberorder/DeweyOrderSetTest.java    |  4 +-
 .../memberorder/MemberOrderComparatorTest.java     |  2 +-
 ...jectAssociationPredicatesTest_visibleWhere.java |  2 +-
 .../interactions/InteractionUtils_isA_Test.java    |  2 +-
 ...erviceInjectorDefaultTest_validateServices.java |  2 +-
 .../ApplicationFeatureRepositoryDefaultTest.java   |  2 +-
 .../isis/metamodel/services/grid/BS3GridTest.java  |  4 +-
 .../services/menubars/BS3MenuBarsTest.java         |  2 +-
 .../metamodel/MetaModelServiceDefaultTest.java     |  6 +--
 ...ionParameterAbstractTest_getId_and_getName.java |  4 +-
 .../specimpl/ObjectAssociationAbstractTest.java    |  2 +-
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  2 +-
 .../testspec/ObjectSpecificationStub.java          |  8 ++--
 .../apache/isis/runtime/context/IsisContext.java   |  2 +-
 .../session/RuntimeEventSupport_Spring.java        |  2 +-
 .../persistence/adapter/ObjectAdapterForBean.java  |  4 +-
 .../runtime/persistence/adapter/PojoAdapter.java   |  6 +--
 .../persistence/session/PersistenceSession.java    |  4 +-
 .../events/PersistenceEventService_Spring.java     |  2 +-
 .../transaction/ChangedObjectsService.java         |  4 +-
 .../transaction/IsisTransactionAspectSupport.java  |  4 +-
 .../transaction/IsisTransactionFlushException.java |  2 +-
 .../IsisTransactionManagerException.java           |  2 +-
 .../apache/isis/runtime/session/IsisSession.java   |  2 +-
 .../runtime/session/IsisSessionFactoryDefault.java | 10 ++---
 .../session/init/InitialisationSession.java        |  2 +-
 .../runtimeservices/InitialisationException.java   |  2 +-
 .../isis/runtimeservices/ServiceException.java     |  2 +-
 .../background/BackgroundCommandExecution.java     |  2 +-
 .../bookmarks/BookmarkServiceInternalDefault.java  |  8 ++--
 .../command/CommandExecutorServiceDefault.java     |  4 +-
 .../confmenu/ConfigurationViewServiceDefault.java  |  8 ++--
 .../runtimeservices/email/EmailServiceDefault.java |  2 +-
 .../isis/runtimeservices/error/EmailTicket.java    |  2 +-
 .../isis/runtimeservices/error/SimpleTicket.java   |  4 +-
 .../factory/FactoryServiceDefault.java             |  4 +-
 .../homepage/HomePageResolverServiceDefault.java   |  8 ++--
 .../apache/isis/runtimeservices/i18n/po/Block.java |  2 +-
 .../isis/runtimeservices/i18n/po/PoReader.java     | 10 ++---
 .../isis/runtimeservices/i18n/po/PoWriter.java     |  4 +-
 .../i18n/po/TranslationServicePo.java              |  6 +--
 .../ixn/InteractionDtoServiceInternalDefault.java  |  1 -
 .../menubars/MenuBarsLoaderServiceDefault.java     |  4 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    | 12 +++---
 .../publish/PublishedObjectsDefault.java           |  8 ++--
 .../publish/PublisherDispatchServiceDefault.java   |  2 +-
 .../repository/RepositoryServiceDefault.java       |  4 +-
 .../userreg/EmailNotificationServiceDefault.java   |  2 +-
 .../runtimeservices/wrapper/AsyncWrapDefault.java  |  2 +-
 .../wrapper/WrapperFactoryDefault.java             |  6 +--
 .../InteractionEventDispatcherTypeSafe.java        |  2 +-
 .../AbstractCollectionInvocationHandler.java       |  2 +-
 .../DelegatingInvocationHandlerDefault.java        |  2 +-
 .../handlers/DomainObjectInvocationHandler.java    |  8 ++--
 .../wrapper/proxy/ProxyCreator.java                |  8 ++--
 .../xactn/TransactionServiceSpring.java            |  2 +-
 .../xmlsnapshot/XmlSnapshotBuilder.java            |  2 +-
 .../email/EmailServiceDefaultTest_actually.java    |  2 +-
 .../isis/runtimeservices/i18n/po/PoReaderTest.java |  4 +-
 .../wrapper/WrapperFactoryDefaultTest.java         |  2 +-
 .../api/authentication/AuthenticationRequest.java  |  2 +-
 .../AuthenticationRequestAbstract.java             |  4 +-
 .../api/authentication/AuthenticationSession.java  |  4 +-
 .../AuthenticationSessionAbstract.java             | 16 ++++----
 .../security/api/authentication/MessageBroker.java |  2 +-
 .../AuthenticationRequestLogonFixture.java         |  2 +-
 .../authentication/health/HealthAuthSession.java   |  2 +-
 .../manager/AuthenticationManager.java             |  6 +--
 .../singleuser/SingleUserSession.java              |  6 +--
 .../standard/NoAuthenticatorException.java         |  2 +-
 .../api/authentication/standard/SimpleSession.java |  4 +-
 .../isis/security/EncodabilityContractTest.java    |  8 ++--
 .../SimpleSessionEncodabilityNoRolesTest.java      |  2 +-
 .../SimpleSessionEncodabilityWithRolesTest.java    |  2 +-
 .../AbstractApplyToAllContractTest.java            |  2 +-
 ...irectionalRelationshipContractTestAbstract.java | 10 ++---
 .../comparable/ComparableContractTester.java       |  2 +-
 .../unittestsupport/config/internal/_Config.java   |  4 +-
 .../config/internal/_Config_Instance.java          |  8 ++--
 .../config/internal/_Config_LifecycleResource.java |  4 +-
 .../config/internal/_Config_Parsers.java           |  4 +-
 .../config/internal/_Config_trim.java              |  2 +-
 ...rviceMethodMustBeFinalContractTestAbstract.java |  6 +--
 .../isis/unittestsupport/jaxb/JaxbMatchers.java    |  4 +-
 .../jmocking/ImposteriserUsingCodegenPlugin.java   |  2 +-
 .../jmocking/JUnitRuleMockery2.java                |  6 +--
 .../unittestsupport/soap/PublishedEndpoints.java   |  4 +-
 .../soap/SoapEndpointPublishingRule.java           |  2 +-
 .../sortedsets/SortedSetsContractTestAbstract.java |  6 +--
 .../isis/unittestsupport/utils/ReflectUtils.java   |  2 +-
 .../isis/webapp/context/memento/ObjectMemento.java |  4 +-
 .../context/memento/ObjectMementoCollection.java   |  2 +-
 .../org/apache/isis/webapp/modules/WebModule.java  |  2 +-
 .../isis/webapp/modules/WebModuleAbstract.java     |  2 +-
 .../isis/webapp/modules/WebModuleContext.java      |  4 +-
 .../logonlog/WebModuleLogOnExceptionLogger.java    |  2 +-
 .../TemplateResourceCachingFilter.java             |  2 +-
 .../templresources/TemplateResourceServlet.java    |  8 ++--
 ...plateResourceServlet_HtmlTemplateVariables.java |  6 +--
 .../templresources/WebModuleTemplateResources.java |  2 +-
 .../webappctx/IsisWebAppContextInitializer.java    |  2 +-
 .../main/java/demoapp/dom/types/blob/BlobDemo.java |  4 +-
 .../dom/types/primitive/PrimitivesDemo.java        |  2 +-
 .../demoapp/utils/LibraryPreloadingService.java    |  4 +-
 .../org/apache/isis/testdomain/jdo/BookDto.java    |  4 +-
 .../isis/testdomain/jdo/InventoryResource.java     |  2 +-
 .../bootstrapping/AutoConfigurationTest.java       |  2 +-
 .../SpringServiceProvisioningTest.java             | 12 +++---
 .../domainmodel/AnnotationSyntesizerTest.java      |  2 +-
 .../DomainModelTest_usingBadDomain.java            |  2 +-
 ...nModelTest_usingBadDomain_noActionEnforced.java |  2 +-
 .../domainmodel/SpecloaderPerformanceTest.java     |  4 +-
 .../eventhandling/SpringEventPublishingTest.java   |  2 +-
 .../isis/testdomain/shiro/AbstractShiroTest.java   |  2 +-
 .../transactions/TransactionRollbackTest.java      |  2 +-
 .../secman/api/SecurityModuleConfig.java           |  2 +-
 .../api/permission/ApplicationPermissionMode.java  |  2 +-
 .../api/permission/ApplicationPermissionRule.java  |  2 +-
 .../permission/ApplicationPermissionValueSet.java  |  4 +-
 .../PermissionsEvaluationServiceAbstract.java      |  2 +-
 ...PermissionsEvaluationServiceVetoBeatsAllow.java |  2 +-
 .../app/feature/ApplicationFeatureViewModel.java   |  4 +-
 .../app/feature/ApplicationFeatureViewModels.java  |  2 +-
 .../user/ApplicationUser_filterPermissions.java    |  2 +-
 .../app/user/ApplicationUser_permissions.java      |  2 +-
 .../model/app/user/UserPermissionViewModel.java    |  4 +-
 .../facets/TenantedAuthorizationFacetFactory.java  |  2 +-
 .../ApplicationPermissionRepository.java           | 10 ++---
 .../secman/jdo/dom/role/ApplicationRole.java       |  2 +-
 .../jdo/dom/role/ApplicationRoleRepository.java    |  2 +-
 .../secman/jdo/dom/tenancy/ApplicationTenancy.java |  2 +-
 .../dom/tenancy/ApplicationTenancyRepository.java  |  2 +-
 .../secman/jdo/dom/user/ApplicationUser.java       |  6 +--
 .../jdo/dom/user/ApplicationUserRepository.java    |  2 +-
 .../secman/jdo/seed/SeedSecurityModuleService.java |  2 +-
 .../AbstractRoleAndPermissionsFixtureScript.java   |  2 +-
 .../scripts/AbstractUserAndRolesFixtureScript.java |  4 +-
 .../IsisModuleSecurityAdminRoleAndPermissions.java |  2 +-
 .../secman/shiro/AuthInfoForApplicationUser.java   |  2 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.java       |  2 +-
 ...lCollectionForApplicationUserOnSingleRealm.java |  2 +-
 .../secman/shiro/PrincipalForApplicationUser.java  |  2 +-
 .../shirorealmldap/realm/impl/IsisLdapRealm.java   |  6 +--
 .../cors/impl/webmodule/WebModuleCors.java         |  2 +-
 .../jee_support/IsisCDIBeanScanInterceptor.java    |  4 +-
 .../SupportingMethodValidatorRefinerFactory.java   |  4 +-
 .../isis/legacy/applib/DomainObjectContainer.java  |  2 +-
 .../internal/threadpool/ThreadPoolSupport.java     | 10 ++---
 .../internal/threadpool/ThreadPoolSupportTest.java |  2 +-
 .../value/money/MoneyValueSemanticsProvider.java   |  2 +-
 .../isis/legacy/restclient/RestfulClient.java      |  2 +-
 .../isis/extensions/restclient/ResponseDigest.java |  6 +--
 .../isis/extensions/restclient/RestfulClient.java  |  6 +--
 .../restclient/auth/BasicAuthFilter.java           |  4 +-
 .../restclient/log/RestfulLoggingFilter.java       |  2 +-
 .../applib/exceptions/NotPersistableException.java |  2 +-
 .../exceptions/UnsupportedFindException.java       |  2 +-
 .../CreateSchemaObjectFromClassMetadata.java       |  2 +-
 ...sistenceQueryFindUsingApplibQueryProcessor.java |  4 +-
 .../queries/PersistenceQueryProcessorAbstract.java |  4 +-
 .../persistence/spi/JdoObjectIdSerializer.java     |  2 +-
 .../service/JdoPersistenceLifecycleService.java    |  4 +-
 .../entities/JdoEntityTypeRegistry.java            |  4 +-
 .../exceprecog/JdoNestedExceptionResolver.java     |  2 +-
 .../datanucleus5/jdosupport/IsisJdoSupportDN5.java |  6 +--
 .../mixins/Persistable_downloadJdoMetadata.java    |  2 +-
 .../datanucleus5/metamodel/JdoMetamodelUtil.java   |  4 +-
 .../metamodel/JdoProgrammingModelPlugin.java       | 10 ++---
 .../JdoDiscriminatorAnnotationFacetFactory.java    |  2 +-
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |  2 +-
 ...doPersistenceCapableAnnotationFacetFactory.java |  2 +-
 .../JdoPersistenceCapableFacetImpl.java            |  6 +--
 .../object/query/VisitorForClauseAbstract.java     |  2 +-
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |  2 +-
 .../objectadapter/ObjectAdapterContext.java        |  4 +-
 .../ObjectAdapterContext_DependencyInjection.java  |  2 +-
 .../ObjectAdapterContext_Factories.java            |  4 +-
 ...ObjectAdapterContext_LifecycleEventSupport.java |  2 +-
 ...ctAdapterContext_ObjectAdapterByIdProvider.java |  8 ++--
 .../DataNucleusApplicationComponents5.java         |  8 ++--
 .../persistence/IsisLifecycleListener.java         |  2 +-
 .../persistence/IsisPersistenceSessionJdoBase.java |  2 +-
 .../persistence/IsisTransactionJdo.java            |  5 +--
 .../persistence/IsisTransactionManagerJdo.java     |  2 +-
 .../persistence/PersistenceSession5.java           |  8 ++--
 .../persistence/PersistenceSessionFactory5.java    |  6 +--
 .../persistence/query/PersistenceQueryFactory.java |  2 +-
 .../transaction/PojoAdapterBuilder.java            |  2 +-
 .../WrapperFactoryDefault_wrappedObject_Test.java  |  2 +-
 ...actoryDefault_wrappedObject_transient_Test.java |  2 +-
 .../keycloak/webmodule/WebModuleKeycloak.java      |  2 +-
 .../shiro/authentication/AuthenticatorShiro.java   |  2 +-
 .../shiro/authorization/IsisPermission.java        |  4 +-
 .../PermissionToRoleMapperFromString.java          |  2 +-
 .../isis/security/shiro/permrolemapper/Util.java   |  4 +-
 .../security/shiro/webmodule/WebModuleShiro.java   |  6 +--
 .../PermissionToRoleMapperFromIniTest.java         |  2 +-
 .../PermissionToRoleMapperFromStringTest.java      |  2 +-
 .../subdomains/excel/applib/dom/ExcelService.java  |  2 +-
 .../excel/applib/dom/util/ExcelServiceImpl.java    |  2 +-
 .../applib/services/FakeDataServiceTest.java       |  4 +-
 .../h2console/ui/webmodule/WebModuleH2Console.java |  6 +--
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java  |  4 +-
 .../integtestsupport/applib/ThrowableMatchers.java |  2 +-
 .../applib/validate/ValidateDomainModel.java       |  2 +-
 .../integration/ObjectFactoryForIntegration.java   |  2 +-
 .../asciidoc/ui/components/AsciiDocComponent.java  |  2 +-
 .../markdown/ui/components/MarkdownComponent.java  |  2 +-
 .../metamodel/facets/SseObserveFacetAbstract.java  |  2 +-
 .../markup/ListeningMarkupComponent_observing.java |  4 +-
 .../sse/ui/services/SseServiceDefault.java         |  2 +-
 .../sse/ui/webmodule/ServerSentEventsServlet.java  |  6 +--
 .../ui/webmodule/WebModuleServerSentEvents.java    |  2 +-
 .../restfulobjects/applib/JsonRepresentation.java  |  4 +-
 .../restfulobjects/applib/RestfulResponse.java     |  2 +-
 .../restfulobjects/applib/util/MediaTypes.java     |  2 +-
 .../viewer/restfulobjects/applib/util/Parser.java  |  8 ++--
 .../restfulobjects/applib/util/PathNode.java       |  6 +--
 .../applib/util/UrlEncodingUtils.java              |  2 +-
 .../viewer/restfulobjects/applib/JsonFixture.java  |  2 +-
 .../JsonRepresentationTest_asInputStream.java      |  4 +-
 .../webmodule/WebModuleJaxrsResteasy4.java         |  2 +-
 .../restfulobjects/rendering/LinkFollowSpecs.java  |  2 +-
 .../rendering/ReprRendererAbstract.java            |  4 +-
 .../rendering/domainobjects/JsonValueEncoder.java  |  6 +--
 .../domainobjects/JsonValueEncoder_Converters.java |  2 +-
 .../rendering/domainobjects/MemberType.java        |  2 +-
 .../domainobjects/ObjectActionReprRenderer.java    |  4 +-
 .../ObjectCollectionReprRenderer.java              |  2 +-
 .../domainobjects/ObjectPropertyReprRenderer.java  |  2 +-
 .../AbstractTypeFeatureReprRenderer.java           |  2 +-
 .../domaintypes/DomainTypeReprRenderer.java        |  2 +-
 .../acceptheader/AcceptHeaderServiceForRest.java   |  4 +-
 .../conneg/ContentNegotiationServiceAbstract.java  |  6 +--
 .../service/swagger/SwaggerServiceMenu.java        |  2 +-
 .../swagger/internal/ClassExcluderAbstract.java    |  2 +-
 .../service/swagger/internal/Generation.java       |  4 +-
 .../rendering/service/swagger/internal/Util.java   |  4 +-
 .../internal/ValuePropertyFactoryDefault.java      |  6 +--
 .../swagger/internal/ValuePropertyPlugin.java      |  2 +-
 .../rendering/util/FollowSpecUtil.java             |  2 +-
 .../rendering/util/JsonWriterUtil.java             |  2 +-
 .../restfulobjects/rendering/util/MapUtils.java    |  2 +-
 .../viewer/restfulobjects/rendering/util/Util.java |  4 +-
 .../viewer/context/ResourceContext.java            |  5 +--
 .../viewer/mappers/ExceptionMapperAbstract.java    |  4 +-
 .../viewer/mappers/entity/ExceptionDetail.java     |  2 +-
 .../resources/DomainObjectResourceServerside.java  |  8 ++--
 .../resources/DomainServiceResourceServerside.java |  2 +-
 .../resources/DomainTypeResourceServerside.java    |  2 +-
 .../viewer/resources/ImageResourceServerside.java  |  4 +-
 .../viewer/resources/ObjectActionArgHelper.java    |  3 +-
 .../viewer/resources/ResourceAbstract.java         |  2 +-
 .../viewer/resources/VersionReprRenderer.java      |  2 +-
 .../webmodule/IsisRestfulObjectsSessionFilter.java |  8 ++--
 .../AuthenticationSessionStrategyBasicAuth.java    |  4 +-
 ..._ensureCompatibleAcceptHeader_ContractTest.java |  2 +-
 .../context/ResourceContext_getArg_Test.java       |  4 +-
 .../viewer/wicket/model/links/LinkAndLabel.java    |  2 +-
 .../wicket/model/links/ListOfLinksModel.java       |  2 +-
 .../wicket/model/mementos/PageParameterNames.java  |  2 +-
 .../wicket/model/models/ActionArgumentModel.java   |  1 -
 .../viewer/wicket/model/models/ActionModel.java    |  6 +--
 .../wicket/model/models/ActionPromptProvider.java  |  2 +-
 .../wicket/model/models/BookmarkTreeNode.java      |  4 +-
 .../wicket/model/models/BookmarkedPagesModel.java  |  2 +-
 .../wicket/model/models/EntityCollectionModel.java | 14 +++----
 .../viewer/wicket/model/models/EntityModel.java    |  4 +-
 .../viewer/wicket/model/models/ScalarModel.java    |  8 ++--
 .../model/models/ToggledMementosProvider.java      |  2 +-
 .../isis/viewer/wicket/model/models/Util.java      |  2 +-
 .../wicket/model/models/WicketComponentUtils.java  |  2 +-
 .../actionresponse/ActionResultResponseType.java   |  2 +-
 .../ui/app/registry/ComponentFactoryRegistrar.java |  2 +-
 .../ui/components/about/JarManifestModel.java      |  6 +--
 .../entityactions/AdditionalLinksPanel.java        |  2 +-
 .../actionmenu/entityactions/LinkAndLabelUtil.java |  2 +-
 .../actionmenu/serviceactions/CssMenuItem.java     |  4 +-
 .../serviceactions/ServiceActionUtil.java          |  4 +-
 .../serviceactions/ServiceActionsPanel.java        |  2 +-
 .../serviceactions/TertiaryActionsPanel.java       |  2 +-
 .../actionprompt/ActionPromptHeaderPanel.java      |  2 +-
 .../components/actions/ActionParametersForm.java   |  3 +-
 .../collection/AssociatedWithActionsHelper.java    |  2 +-
 .../ui/components/collection/CollectionPanel.java  |  4 +-
 .../selector/CollectionSelectorHelper.java         |  2 +-
 .../CollectionContentsAsAjaxTablePanel.java        |  8 ++--
 .../CollectionContentsSortableDataProvider.java    |  4 +-
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java  |  2 +-
 .../ajaxtable/IsisAjaxNavigationToolbar.java       |  2 +-
 .../ajaxtable/IsisTotalRecordsToolbar.java         |  2 +-
 .../ajaxtable/PrototypingMessageProvider.java      |  4 +-
 .../columns/ObjectAdapterPropertyColumn.java       |  2 +-
 .../columns/ObjectAdapterToggleboxColumn.java      |  2 +-
 .../summary/CollectionContentsAsSummary.java       |  2 +-
 .../components/entity/fieldset/PropertyGroup.java  |  6 +--
 .../selector/links/EntityLinksSelectorPanel.java   |  2 +-
 .../wicket/ui/components/footer/FooterPanel.java   |  4 +-
 .../wicket/ui/components/layout/bs3/Util.java      |  2 +-
 .../wicket/ui/components/layout/bs3/col/Col.java   |  4 +-
 .../components/layout/bs3/tabs/TabGroupPanel.java  |  2 +-
 .../components/scalars/IsisConverterLocator.java   |  4 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |  2 +-
 .../components/scalars/ScalarPanelAbstract2.java   |  6 +--
 .../scalars/ScalarPanelSelect2Abstract.java        |  1 -
 .../scalars/ScalarPanelTextFieldAbstract.java      |  2 +-
 .../scalars/reference/ReferencePanel.java          |  3 +-
 .../ui/components/scalars/uuid/UuidConverter.java  |  2 +-
 .../valuechoices/ValueChoicesSelect2Panel.java     |  5 +--
 .../components/tree/IsisToWicketTreeAdapter.java   |  6 +--
 .../widgets/breadcrumbs/BreadcrumbModel.java       |  4 +-
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |  2 +-
 .../widgets/buttons/ContainedButtonPanel.java      |  2 +-
 .../select2/Select2BootstrapCssReference.java      |  2 +-
 .../widgets/select2/Select2JsReference.java        |  2 +-
 .../ObjectAdapterMementoProviderAbstract.java      |  4 +-
 ...entoProviderForReferenceObjectAutoComplete.java |  2 +-
 ...derForReferenceParamOrPropertyAutoComplete.java |  4 +-
 ...bjectAdapterMementoProviderForValueChoices.java |  2 +-
 .../themepicker/IsisWicketThemeSupport.java        |  2 +-
 .../themepicker/IsisWicketThemeSupportDefault.java |  6 +--
 .../themepicker/ThemeProviderComposite.java        |  6 +--
 .../viewer/wicket/ui/errors/ExceptionModel.java    |  6 +--
 .../viewer/wicket/ui/errors/JGrowlBehaviour.java   |  2 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  2 +-
 .../viewer/wicket/ui/pages/error/ErrorPage.java    |  2 +-
 .../wicket/ui/pages/login/IsisSignInPanel.java     |  2 +-
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |  2 +-
 .../wicket/ui/panels/FormExecutorDefault.java      |  4 +-
 .../isis/viewer/wicket/ui/panels/PanelUtil.java    |  2 +-
 .../wicket/ui/panels/PromptFormAbstract.java       |  2 +-
 .../isis/viewer/wicket/ui/util/Components.java     |  2 +-
 .../viewer/wicket/ui/util/CssClassAppender.java    |  2 +-
 .../viewer/wicket/ui/util/CssClassRemover.java     |  2 +-
 .../isis/viewer/wicket/ui/util/CssIdAppender.java  |  2 +-
 .../isis/viewer/wicket/ui/util/Tooltips.java       |  2 +-
 ...tAdapterMementoProviderForValueChoicesTest.java |  2 +-
 .../ConverterForObjectAdapterMemento.java          |  2 +-
 .../viewer/integration/LocalizerForIsis.java       |  2 +-
 .../viewer/integration/WebRequestCycleForIsis.java |  4 +-
 .../ComponentFactoryRegistrarDefault.java          |  3 +-
 .../ComponentFactoryRegistryDefault.java           |  6 +--
 .../registries/pages/PageClassRegistryDefault.java |  2 +-
 .../services/HintStoreUsingWicketSession.java      |  2 +-
 .../services/ImageResourceCacheClassPath.java      |  4 +-
 .../services/TranslationsResolverWicket.java       |  2 +-
 .../viewer/services/mementos/CollectionData.java   |  2 +-
 .../viewer/services/mementos/ObjectMarshaller.java |  8 ++--
 .../services/mementos/ObjectMementoLegacy.java     |  8 ++--
 .../mementos/ObjectMementoServiceWicket.java       |  4 +-
 .../services/mementos/ObjectUnmarshaller.java      |  8 ++--
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  4 +-
 .../viewer/wicketapp/IsisWicketApplication.java    |  8 ++--
 .../IsisWicketApplication_Experimental.java        |  2 +-
 .../IsisWicketApplication_newPageFactory.java      |  2 +-
 899 files changed, 1684 insertions(+), 1874 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
index 417c838..7a7a2d6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 public class Identifier implements Comparable<Identifier> {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
index 2db604b..a5ef8d0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib;
 
 import org.apache.isis.applib.services.exceprecog.TranslatableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.functions._Functions;
 
 /**
  * Indicates that an unexpected, non-recoverable (fatal) exception has occurred within
diff --git a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
index 95df889..a52e2f5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib;
 
 import org.apache.isis.applib.services.exceprecog.TranslatableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 /**
  * Indicates that an exceptional condition/problem has occurred within the application's domain logic.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java b/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
index 9eb6659..dd0ff85 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
@@ -21,9 +21,9 @@ package org.apache.isis.applib.client;
 import java.util.EnumSet;
 import java.util.List;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 /**
  * 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
index 4d4ac5f..f72000b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
@@ -21,15 +21,13 @@ package org.apache.isis.applib.events.domain;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.util.ObjectContracts;
 import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
index 6668e33..06a9edb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
@@ -20,9 +20,9 @@ package org.apache.isis.applib.events.domain;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * @since 2.0
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
index d52e577..cd8341f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
 import org.apache.isis.applib.layout.menubars.MenuBars;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 /**
  * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.isis.applib.annotation.DomainServiceLayout}.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
index 81eb614..e46d79c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.schema.common.v1.BookmarkObjectState;
 import org.apache.isis.schema.common.v1.OidDto;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
index 2f33de8..2e7b5d1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.applib.query;
 
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
 
 import lombok.Getter;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
index c831be8..78267b8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.applib.services.appfeat;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 public enum ApplicationMemberType {
     PROPERTY,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
index c685ba0..ec03bb3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
 import java.util.Objects;
 
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.schema.common.v1.BookmarkObjectState;
 import org.apache.isis.schema.common.v1.OidDto;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index da05d27..cdb0bda 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -20,10 +20,10 @@ package org.apache.isis.applib.services.bookmark;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 import lombok.val;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
index 631c0ec..de0e952 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 @XmlRootElement(name = "configurationProperty")
 @XmlType(
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
index 9d26dfc..5a6a016 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 public interface ContentMappingService {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 53048b3..1a2c5dc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -29,8 +29,8 @@ import javax.inject.Inject;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
index 4e0e7ed..d8ef200 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Convenience implementation of {@link ExceptionRecognizer} that loops through a list of
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
index 7ace8f5..0cb2674 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
@@ -23,10 +23,10 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
-import static org.apache.isis.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.getCausalChain;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.getCausalChain;
 
 import lombok.val;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index 28b2d9e..8f8f1f9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 @Value
 public final class TranslatableString {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index d53e822..378c702 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -38,8 +38,8 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
 import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.schema.common.v1.DifferenceDto;
 import org.apache.isis.schema.common.v1.InteractionType;
 import org.apache.isis.schema.common.v1.PeriodDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
index 09a7375..820314c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
@@ -41,8 +41,8 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 /**
  * An implementation of {@link SchemaOutputResolver} that keeps track of all the schemas for which it has
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index a6a98a3..c2d626b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -36,9 +36,9 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
 import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 public interface JaxbService {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index 7f973e8..9d2cf55 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.menu.MenuBarsService;
 import org.apache.isis.applib.value.Blob;
 import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 @Named("isisApplib.LayoutServiceMenu")
 @DomainService(objectType = "isisApplib.LayoutServiceMenu")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index b1e5778..01b9723 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties.S
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.schema.metamodel.v1.MetamodelDto;
 
 import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index 8b103c8..77a0ad5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -42,9 +42,9 @@ import org.apache.isis.applib.annotation.RestrictTo;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.schema.metamodel.v1.MetamodelDto;
 
 @Named("isisApplib.MetaModelServicesMenu")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
index 61908de..869e486 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
@@ -32,9 +32,9 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.WithTransactionScope;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index 43ed4a4..bdadaaf 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -27,12 +27,12 @@ import java.util.stream.Stream;
 
 import javax.annotation.Priority;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Reduction;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Reduction;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 
 import lombok.val;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 7e33a95..79f817b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -29,7 +29,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 /**
  * This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
index 8f2749d..19be5e2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib.services.urlencoding;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.memento._Mementos.EncoderDecoder;
 
 public interface UrlEncodingService extends EncoderDecoder {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
index 8bc0dd2..bedd2b1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
@@ -20,8 +20,8 @@ package org.apache.isis.applib.services.urlencoding;
 
 import java.nio.charset.StandardCharsets;
 
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 /**
  * to use, subclass and annotated with:
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
index b7f753b..21b5d53 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
@@ -28,8 +28,8 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 @Service
 @Named("isisApplib.UrlEncodingServiceWithCompression")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index 110e6fc..7bd193f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.spec;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 /**
  * Adapter to make it easy to write {@link Specification}s.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
index f34b28f..34001ce 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 @Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
 public class LazyTreeNode<T> implements TreeNode<T> {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
index 760bde1..927ad3b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
@@ -28,7 +28,7 @@ import java.util.stream.StreamSupport;
 import javax.annotation.Nullable;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 public interface TreeNode<T> {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java b/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
index 2e5f185..d2d3129 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.util;
 
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 public final class Enums {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java b/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
index a8509fd..c4610ca 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Fluent Object Equality Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java b/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
index 1a393a4..5754570 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Fluent Object Hash Code Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
index b0f2f10..67a142e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
@@ -30,8 +30,8 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.apache.isis.applib.value.Blob;
 import org.apache.isis.applib.value.Markup;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 /**
  * Provides JAXB XmlAdapters for Java built-in temporal types. 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
index db7b1a3..ae8f8a1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
@@ -30,9 +30,9 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 import lombok.val;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
index 9120f11..e8d9aab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 /**
  * Package private parser for ObjectContract.<br/><br/>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
index 2be0ad6..0a209c0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
@@ -22,8 +22,8 @@ import java.util.Comparator;
 import java.util.Objects;
 import java.util.function.Function;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
index c10f0ba..b3cd010 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
@@ -23,7 +23,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Extension to applib's {@link ReasonBuffer}.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
index 1219e34..edd02cc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.util;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 
 /**
  * Title buffer is a utility class to help produce titles for objects without
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java b/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
index 129c52d..a11a431 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
@@ -24,7 +24,7 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Fluent Object to String Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java b/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
index d60adc5..bea7b06 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
@@ -24,7 +24,7 @@ import java.io.OutputStreamWriter;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
index 7412d5f..78043f8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
@@ -32,7 +32,7 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
 import org.apache.isis.schema.chg.v1.ChangesDto;
 
 public final class ChangesDtoUtils {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
index 07373ba..820a995 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
@@ -31,7 +31,7 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
 import org.apache.isis.schema.cmd.v1.ActionDto;
 import org.apache.isis.schema.cmd.v1.CommandDto;
 import org.apache.isis.schema.cmd.v1.MapDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index 4bb592d..c80b435 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -36,11 +36,11 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
 import org.apache.isis.applib.value.Blob;
 import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.schema.cmd.v1.MapDto;
 import org.apache.isis.schema.cmd.v1.ParamDto;
 import org.apache.isis.schema.common.v1.BlobDto;
@@ -57,7 +57,7 @@ import org.apache.isis.schema.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendar
 import org.apache.isis.schema.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
 import org.apache.isis.schema.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
 
-import static org.apache.isis.commons.internal.collections._Maps.entry;
+import static org.apache.isis.core.commons.internal.collections._Maps.entry;
 
 public final class CommonDtoUtils {
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
index 75d5ffa..a6fc9e2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
 import org.apache.isis.applib.services.iactn.Interaction;
 import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.resources._Resources;
 import org.apache.isis.schema.cmd.v1.ParamDto;
 import org.apache.isis.schema.cmd.v1.ParamsDto;
 import org.apache.isis.schema.common.v1.InteractionType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
index 7b4d236..999af94 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.schema.common.v1.DifferenceDto;
 import org.apache.isis.schema.common.v1.PeriodDto;
 import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java b/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
index 2930be7..1c031c2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.value;
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
-import static org.apache.isis.commons.internal.base._Strings.asFileNameWithExtension;
+import static org.apache.isis.core.commons.internal.base._Strings.asFileNameWithExtension;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
index bc8c6df..b6fa72a 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
@@ -33,10 +33,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
 
 public class MementosTest {
 
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
index 01ba575..2b301da 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 public class XmlSnapshotServiceAbstractTest {
 
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index ba2d6cf..61363dc 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.junit.Before;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
 
 public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 842f53d..359f01c 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -30,8 +30,8 @@
 	<properties>
 		<objenesis.version>2.6</objenesis.version>
 
-		<jar-plugin.automaticModuleName>org.apache.isis.codegen.bytebuddy</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/codegen/bytebuddy</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.core.codegen.bytebuddy</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/core/codegen/bytebuddy</git-plugin.propertiesDir>
 	</properties>
 
 	<build>
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
index 14a624d..7e81aa1 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
@@ -4,7 +4,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCommons;
 
 @Configuration
 @Import({
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
index 15b7fff..2dae439 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
@@ -28,12 +28,12 @@ import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 import org.springframework.stereotype.Service;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
 
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.NamingStrategy;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
deleted file mode 100644
index 7808f44..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
deleted file mode 100644
index affb458..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.functions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
deleted file mode 100644
index 27f2189..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.memento;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
deleted file mode 100644
index e84ac61..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.reflection;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
deleted file mode 100644
index 50399b9..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.resources;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
similarity index 66%
rename from core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
index 36c8725..b6f8268 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
@@ -1,9 +1,9 @@
-package org.apache.isis.commons;
+package org.apache.isis.core.commons;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 
 @Configuration
 @Import({
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
index 6c8bf51..bc615d0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,9 +34,9 @@ import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import javax.enterprise.inject.Instance;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 import lombok.val;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
index 73aea09..acb595b 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
index 783a759..d120f09 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
index 4248bde..0962676 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
index 5371493..c5c5b35 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
 
 /**
  * @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java b/core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
index 56b1455..15783c6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.concurrent;
+package org.apache.isis.core.commons.concurrent;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.RequiredArgsConstructor;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
index 23b0e93..034124e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
 
 
 import java.io.PrintWriter;
@@ -28,7 +28,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 
 /**
  * <p>Provides utilities for manipulating and examining
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
index 618c122..7e5b3c2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
 
 /**
  * Indicates an error raised by the application code.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
index 819d567..bb0e1a5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
 
 import java.text.MessageFormat;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
index 537bf42..e33bd59 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
 
 /**
  * Indicates that a call was made to a method (normally an overridden one) that
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
index dc448d6..f26852e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
 
 public class UnknownTypeException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
index de038f6..80dca93 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
@@ -18,8 +18,8 @@
  */
 
 /**
- * Defines {@link org.apache.isis.commons.exceptions.IsisException base class}
+ * Defines {@link org.apache.isis.core.commons.exceptions.IsisException base class}
  * for exceptions raised either by Isis itself or by the domain model
  * running on top of Isis.
  */
-package org.apache.isis.commons.exceptions;
\ No newline at end of file
+package org.apache.isis.core.commons.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java b/core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
index 120f9c0..28acb43 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.handler;
+package org.apache.isis.core.commons.handler;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
index 53e4f33..041749f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal;
+package org.apache.isis.core.commons.internal;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
index 3b17ed9..8e31070 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.assertions;
+package org.apache.isis.core.commons.internal.assertions;
 
 import java.util.Objects;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 public final class _Assert {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
index 73dd263..a195929 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.lang.ref.WeakReference;
 import java.util.Random;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
index 89005fc..de3b7ae 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,8 +27,8 @@ import java.util.function.UnaryOperator;
 
 import javax.annotation.Nullable;
 
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
index 59575dc..10b16dd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
index 683f666..13de96e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
@@ -17,12 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 /**
  *
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
index cd433c1..66825b2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
@@ -17,14 +17,14 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
 
 import javax.annotation.Nullable;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
index 0fb04a4..2715b95 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
@@ -26,7 +26,7 @@ import java.util.function.Function;
 
 import javax.annotation.Nullable;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
index f29d690..526d739 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.function.Supplier;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
index a2c492d..8010bcc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.function.Supplier;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * package private mixin for _Lazy 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
similarity index 93%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
index 7ec7ed7..f1de3c2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.function.Supplier;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * package private mixin for _Lazy 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
index fda8be2..39f9677 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
index 8cb2674..ab8fc6e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Optional;
 import java.util.function.BinaryOperator;
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
index ba83deb..8b65414 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -42,15 +42,15 @@ import java.util.stream.StreamSupport;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Bytes.BytesOperator;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Bytes.BytesOperator;
 
-import static org.apache.isis.commons.internal.base._NullSafe.size;
-import static org.apache.isis.commons.internal.base._Strings_SplitIterator.splitIterator;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.base._NullSafe.size;
+import static org.apache.isis.core.commons.internal.base._Strings_SplitIterator.splitIterator;
+import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
index 7e6a529..a1cd524 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
index 0fc181f..ea2d8d3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
-
-import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
+package org.apache.isis.core.commons.internal.base;
 
 /**
  *
@@ -46,7 +44,7 @@ final class _Strings_HtmlEscaper {
 
         String output = input;
 
-        for(KeyValuePair replacement : replacements) {
+        for(_Strings.KeyValuePair replacement : replacements) {
             output = output.replace(replacement.getKey(), replacement.getValue());
         }
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
index 5a1bb07..6abe6a6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Optional;
 
-import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
-
-import static org.apache.isis.commons.internal.exceptions._Exceptions.notImplemented;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.notImplemented;
 
 /**
  *
@@ -32,7 +30,7 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.notImpleme
  */
 final class _Strings_KeyValuePair implements _Strings.KeyValuePair {
 
-    static KeyValuePair of(String key, String value) {
+    static _Strings.KeyValuePair of(String key, String value) {
         return new _Strings_KeyValuePair(key, value);
     }
 
@@ -64,7 +62,7 @@ final class _Strings_KeyValuePair implements _Strings.KeyValuePair {
      *
      * @return a non-empty Optional, if (and only if) the {@code keyValueLiteral} does contain at least one '='
      */
-    public static Optional<KeyValuePair> parse(String keyValueLiteral) {
+    public static Optional<_Strings.KeyValuePair> parse(String keyValueLiteral) {
 
         if(_Strings.isNullOrEmpty(keyValueLiteral)) {
             return Optional.empty();
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
index 0f1dd27..420a882 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import javax.annotation.Nullable;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
index 4613043..7d03ba8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
index 7fa9a15..1de50af 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Locale;
 import java.util.function.Supplier;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
index 6668abb..daedf41 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import lombok.Value;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
index 2607220..6147b8e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
similarity index 95%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
index c37920f..d4620a0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.base;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
index a248237..88d718a 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -29,11 +29,10 @@ import java.util.stream.Collector;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.NonNull;
 import lombok.val;
@@ -80,7 +79,7 @@ public final class _Arrays {
         if(s1==0) {
             return false;
         }
-        requires(test, "test");
+        _With.requires(test, "test");
 
         for(int i=0; i<s1; ++i) {
             if(test.test(array1[i], array2[i])) {
@@ -106,7 +105,7 @@ public final class _Arrays {
             @Nullable final T[] array1, 
             @Nullable final T[] array2, 
             final BiPredicate<T, T> test) {
-        requires(test, "test");
+        _With.requires(test, "test");
         return !testAnyMatch(array1, array2, test.negate());
     }
 
@@ -138,7 +137,7 @@ public final class _Arrays {
      * @return
      */
     public static <T> Collector<T,?,T[]> toArray(final Class<T> componentType, final int length){
-        requires(componentType, "componentType");
+        _With.requires(componentType, "componentType");
         return new _Arrays_Collector<T>(componentType, length);
     }
 
@@ -148,7 +147,7 @@ public final class _Arrays {
      * @return
      */
     public static <T> Collector<T,?,T[]> toArray(final Class<T> componentType){
-        requires(componentType, "componentType");
+        _With.requires(componentType, "componentType");
         return new _Arrays_CollectorUnknownSize<T>(componentType);
     }
 
@@ -162,7 +161,7 @@ public final class _Arrays {
      */
     @SafeVarargs
     public static <T> T[] combine(T first, @Nullable  T... rest) {
-        requires(first, "first");
+        _With.requires(first, "first");
         final int restLength = _NullSafe.size(rest);
         final T[] all = _Casts.uncheckedCast(Array.newInstance(first.getClass(), restLength+1));
         all[0] = first;
@@ -181,8 +180,8 @@ public final class _Arrays {
      */
     @SafeVarargs
     public static <T, X extends T, Y extends T> T[] combine(Class<T> type, X first, @Nullable  Y... rest) {
-        requires(type, "type");
-        requires(first, "first");
+        _With.requires(type, "type");
+        _With.requires(first, "first");
         final int restLength = _NullSafe.size(rest);
         final T[] all = _Casts.uncheckedCast(Array.newInstance(type, restLength+1));
         all[0] = first;
@@ -223,7 +222,7 @@ public final class _Arrays {
      *     have been copied (non-null)
      */
     public static <T> T[] toArray(@Nullable final Collection<? extends T> collection, final Class<T> componentType) {
-        requires(componentType, "componentType");
+        _With.requires(componentType, "componentType");
         return _NullSafe.stream(collection)
                 .collect(toArray(componentType, collection!=null ? collection.size() : 0));
     }
@@ -237,7 +236,7 @@ public final class _Arrays {
      *     have been copied (non-null)
      */
     public static <T> T[] toArray(@Nullable final Iterable<? extends T> iterable, final Class<T> componentType) {
-        requires(componentType, "componentType");
+        _With.requires(componentType, "componentType");
         if(iterable!=null && (iterable instanceof Collection)) {
             return toArray((Collection<? extends T>) iterable, componentType);
         }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
index 00ab2d1..2a1f874 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.lang.reflect.Array;
 import java.util.Collections;
@@ -28,7 +28,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 /**
  *
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
index b81b64b..696a399 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 
 /**
  *
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
index 2566eb7..6ae98e0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -39,9 +39,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  * <h1>- internal use only -</h1>
@@ -204,7 +203,7 @@ public final class _Collections {
      */
     public static <T> Collector<T, ?, ? extends Collection<T>> toUnmodifiableOfType(Class<?> typeOfCollection) {
 
-        requires(typeOfCollection, "typeOfCollection");
+        _With.requires(typeOfCollection, "typeOfCollection");
 
         if(SortedSet.class.equals(typeOfCollection)) {
             return toUnmodifiableSortedSet();
@@ -311,7 +310,7 @@ public final class _Collections {
     // -- TO STRING
 
     public static String toStringJoining(@Nullable Collection<?> collection, String delimiter) {
-        requires(delimiter, "delimiter");
+        _With.requires(delimiter, "delimiter");
         return _NullSafe.stream(collection)
                 .map(x->""+x)
                 .collect(Collectors.joining(delimiter));
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
index b0d0e4d..01fbdb5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +28,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  *
@@ -43,8 +43,8 @@ class _Collections_Collector<T, C extends Collection<T>> implements Collector<T,
     private final Function<C, C> finisher;
 
     _Collections_Collector(Supplier<C> supplier, Function<C, C> finisher) {
-        this.supplier = requires(supplier, "supplier");
-        this.finisher = requires(finisher, "finisher");
+        this.supplier = _With.requires(supplier, "supplier");
+        this.finisher = _With.requires(finisher, "finisher");
     }
 
     @Override
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
index 9aaa6ed..409cad0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
index 243475a..b3b3d8e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
index 47dac6b..6c20958 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,9 +34,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  * <h1>- internal use only -</h1>
@@ -71,7 +70,7 @@ public final class _Lists {
      * @return non null
      */
     public static <T> List<T> singleton(T element) {
-        requires(element, "element"); // don't accept null element
+        _With.requires(element, "element"); // don't accept null element
         return Collections.singletonList(element);
     }
 
@@ -92,7 +91,7 @@ public final class _Lists {
      */
     @SafeVarargs
     public static <T> List<T> of(T ... elements) {
-        requires(elements, "elements"); // don't accept null as argument
+        _With.requires(elements, "elements"); // don't accept null as argument
         if(elements.length==0) {
             return Collections.emptyList();
         }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
index c4b6cc9..8e31ef7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.AbstractMap;
 import java.util.Collection;
@@ -35,12 +35,11 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.NonNull;
 import lombok.Value;
@@ -126,7 +125,7 @@ public final class _Maps {
 
     @SafeVarargs
     public static <K, V> Map<K, V> unmodifiableEntries(Map.Entry<? extends K,? extends V>... entries) {
-        requires(entries, "entries"); // don't accept null elements
+        _With.requires(entries, "entries"); // don't accept null elements
         if(entries.length==0) {
             return Collections.emptyMap();
         }
@@ -172,14 +171,14 @@ public final class _Maps {
             Predicate<K> keyFilter, 
             Supplier<Map<K, V>> factory) {
 
-        requires(factory, "factory");
+        _With.requires(factory, "factory");
         final Map<K, V> result = factory.get();
 
         if(input==null) {
             return result;
         }
 
-        requires(keyFilter, "keyFilter");
+        _With.requires(keyFilter, "keyFilter");
 
         input.forEach((k, v)->{
             if(keyFilter.test(k)) {
@@ -238,7 +237,7 @@ public final class _Maps {
     public static <K, V> AliasMap<K, V> newAliasMap(
             final Supplier<Map<K, V>> mapFactory){
         
-        requires(mapFactory, "mapFactory");
+        _With.requires(mapFactory, "mapFactory");
 
         return new AliasMap<K, V>() {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
index d0a20c4..0457f68 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,9 +39,8 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._Casts;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.val;
 
@@ -196,8 +195,8 @@ public class _Multimaps {
             final Supplier<Map<K, List<V>>> mapFactory,
             final Supplier<List<V>> elementCollectionFactory){
         
-        requires(mapFactory, "mapFactory");
-        requires(elementCollectionFactory, "elementCollectionFactory");
+        _With.requires(mapFactory, "mapFactory");
+        _With.requires(elementCollectionFactory, "elementCollectionFactory");
 
         return new ListMultimap<K, V>() {
 
@@ -234,8 +233,8 @@ public class _Multimaps {
             final Supplier<? extends Map<K, S>> mapFactory,
             final Supplier<S> elementCollectionFactory){
         
-        requires(mapFactory, "mapFactory");
-        requires(elementCollectionFactory, "elementCollectionFactory");
+        _With.requires(mapFactory, "mapFactory");
+        _With.requires(elementCollectionFactory, "elementCollectionFactory");
 
         return new SetMultimap<K, V>() {
 
@@ -272,8 +271,8 @@ public class _Multimaps {
             final Supplier<Map<K1, Map<K2, V>>> mapFactory,
             final Supplier<Map<K2, V>> elementMapFactory){
         
-        requires(mapFactory, "mapFactory");
-        requires(elementMapFactory, "elementMapFactory");
+        _With.requires(mapFactory, "mapFactory");
+        _With.requires(elementMapFactory, "elementMapFactory");
 
         return new MapMultimap<K1, K2, V>() {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
index 172c25b..09a086f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -38,10 +38,10 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
 
 /**
  * <h1>- internal use only -</h1>
@@ -67,7 +67,7 @@ public final class _Sets {
      * @return non null
      */
     public static <T> Set<T> singleton(T element) {
-        requires(element, "element"); // don't accept null element
+        _With.requires(element, "element"); // don't accept null element
         return Collections.singleton(element);
     }
 
@@ -88,7 +88,7 @@ public final class _Sets {
      */
     @SafeVarargs
     public static <T> Set<T> of(T ... elements) {
-        requires(elements, "elements");// don't accept null as argument
+        _With.requires(elements, "elements");// don't accept null as argument
         if(elements.length==0) {
             return Collections.emptySet();
         }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
index 1bd8317..9ce49a4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.stream.Stream;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
index c37920f..6e97271 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.collections;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
index becad61..fe3c064 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.collections.snapshot;
+package org.apache.isis.core.commons.internal.collections.snapshot;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@ import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -97,7 +97,7 @@ public final class _VersionedList<T> {
 
     public Snapshot<T> deltaSince(Snapshot<T> snapshot) {
 
-        requires(snapshot, "snapshot");
+        _With.requires(snapshot, "snapshot");
 
         if(snapshot.ownerUuid!=uuid) {
             throw new IllegalArgumentException("Snapshot's UUID is different from the VersionedList's.");
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
index fad7be8..3086c91 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
 
 import java.util.Comparator;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
index a00a19d..10485d8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
 
 import java.util.StringTokenizer;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 /**
  *
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
index bcc7049..109a805 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.collections;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.compare;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
index b74b775..5173968 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
index dfa7dba..7a3dafb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
 
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.Getter;
 import lombok.val;
@@ -101,7 +101,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
     
     public _ConcurrentTask<T> withName(String name) {
         
-        requires(name, "name");
+        _With.requires(name, "name");
         
         val delegate = this;
         
@@ -123,7 +123,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
     
     public _ConcurrentTask<T> withName(Supplier<String> nameSupplier) {
         
-        requires(nameSupplier, "nameSupplier");
+        _With.requires(nameSupplier, "nameSupplier");
         
         val delegate = this;
         
@@ -148,7 +148,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
     
     public static _ConcurrentTask<Void> of(Runnable runnable) {
         
-        requires(runnable, "runnable");
+        _With.requires(runnable, "runnable");
         
         return new _ConcurrentTask<Void>() {
             
@@ -168,7 +168,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
     
     public static <X> _ConcurrentTask<X> of(Callable<X> callable) {
         
-        requires(callable, "callable");
+        _With.requires(callable, "callable");
         
         return new _ConcurrentTask<X>() {
             
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
index bc6295f..54a0429 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
@@ -32,8 +32,8 @@ import java.util.concurrent.atomic.LongAdder;
 
 import org.apache.logging.log4j.Level;
 
-import org.apache.isis.commons.concurrent.AwaitableLatch;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.concurrent.AwaitableLatch;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
index 5d1485f..82af6d7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
 
 import java.util.List;
 import java.util.Map;
@@ -26,14 +26,13 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseThrow;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 /**
  * <h1>- internal use only -</h1>
@@ -71,8 +70,8 @@ public final class _Context {
      *  on the current context.
      */
     public static <T> void putSingleton(Class<? super T> type, T singleton) {
-        requires(type, "type");
-        requires(singleton, "singleton");
+        _With.requires(type, "type");
+        _With.requires(singleton, "singleton");
 
         // let writes to the map be atomic
         synchronized ($LOCK) {
@@ -92,8 +91,8 @@ public final class _Context {
      * @return whether the {@code singleton} was put on the context or ignored because there is already one present
      */
     public static <T> boolean put(Class<? super T> type, T singleton, boolean override) {
-        requires(type, "type");
-        requires(singleton, "singleton");
+        _With.requires(type, "type");
+        _With.requires(singleton, "singleton");
 
         // let writes to the map be atomic
         synchronized ($LOCK) {
@@ -124,8 +123,8 @@ public final class _Context {
      * @return null, if there is no such instance
      */
     public static <T> T computeIfAbsent(Class<? super T> type, Function<Class<? super T>, T> factory) {
-        requires(type, "type");
-        requires(factory, "factory");
+        _With.requires(type, "type");
+        _With.requires(factory, "factory");
 
         final T existingIfAny = _Casts.uncheckedCast(singletonMap.get(type));
         if(existingIfAny!=null) {
@@ -167,8 +166,8 @@ public final class _Context {
      * @return null, if there is no such instance
      */
     public static <T> T computeIfAbsent(Class<? super T> type, Supplier<T> factory) {
-        requires(type, "type");
-        requires(factory, "factory");
+        _With.requires(type, "type");
+        _With.requires(factory, "factory");
         return computeIfAbsent(type, __->factory.get());
     }
 
@@ -183,8 +182,8 @@ public final class _Context {
      * @return
      */
     public static <T> T getOrElse(Class<? super T> type, Supplier<T> fallback) {
-        requires(fallback, "fallback");
-        return ifPresentElseGet(getIfAny(type), fallback);
+        _With.requires(fallback, "fallback");
+        return _With.ifPresentElseGet(getIfAny(type), fallback);
     }
 
     /**
@@ -200,9 +199,9 @@ public final class _Context {
             Supplier<E> onNotFound)
                     throws E {
 
-        requires(type, "type");
-        requires(onNotFound, "onNotFound");
-        return ifPresentElseThrow(getIfAny(type), onNotFound);
+        _With.requires(type, "type");
+        _With.requires(onNotFound, "onNotFound");
+        return _With.ifPresentElseThrow(getIfAny(type), onNotFound);
     }
 
     /**
@@ -212,7 +211,7 @@ public final class _Context {
      * @return
      */
     public static <T> T getElseFail(Class<? super T> type) {
-        return ifPresentElseThrow(getIfAny(type), ()-> 
+        return _With.ifPresentElseThrow(getIfAny(type), ()->
         new NoSuchElementException(String.format("Could not resolve an instance of type '%s'", type.getName())));
     }
 
@@ -246,7 +245,7 @@ public final class _Context {
     }
 
     private static void closeAnyClosables(List<Object> objects) {
-        stream(objects)
+        _NullSafe.stream(objects)
         .forEach(_Context::tryClose);
     }
 
@@ -323,7 +322,7 @@ public final class _Context {
         if(!alreadyRegistered || override) {
             // let writes to the map be atomic
             synchronized ($LOCK) {
-                singletonMap.put(ClassLoader.class, requires(classLoader, "classLoader"));
+                singletonMap.put(ClassLoader.class, _With.requires(classLoader, "classLoader"));
             }
         }
     }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
index 1b81572..a42b783 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
@@ -17,16 +17,15 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
 
 import java.util.Map;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Multimaps;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Multimaps;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.Value;
 import lombok.val;
@@ -59,8 +58,8 @@ final class _Context_ThreadLocal {
     }
 
     static <T> Runnable put(Class<? super T> type, T variant) {
-        requires(type, "type");
-        requires(variant, "variant");
+        _With.requires(type, "type");
+        _With.requires(variant, "variant");
 
         val threadLocalMap = getOrCreateThreadLocalMap();
         threadLocalMap
@@ -129,7 +128,7 @@ final class _Context_ThreadLocal {
             InheritableThreadLocal.withInitial(()->ThreadKey.of(Thread.currentThread()));
 
 
-    private final static _Multimaps.MapMultimap<ThreadKey, Class<?>, Can<?>> MAPS_BY_KEY = 
+    private final static _Multimaps.MapMultimap<ThreadKey, Class<?>, Can<?>> MAPS_BY_KEY =
             _Multimaps.newConcurrentMapMultimap(); 
 
     private static Map<Class<?>, Can<?>> getThreadLocalMap() {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
similarity index 93%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
index f2a71be..9771bb8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
 
 import java.io.File;
 import java.net.URL;
@@ -31,12 +31,11 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.plugins.PluginResolveException;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.plugins.PluginResolveException;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  * <h1>- internal use only -</h1>
@@ -70,7 +69,7 @@ public final class _Plugin {
      * @return non null
      */
     public static <S> Set<S> loadAll(Class<S> service){
-        requires(service, "service");
+        _With.requires(service, "service");
 
         ServiceLoader<S> loader = ServiceLoader.load(service, _Context.getDefaultClassLoader());
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
index 4153ce4..acfbfa4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.base;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.context;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
index 3bd851b..df0eb69 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
@@ -17,17 +17,17 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.debug;
+package org.apache.isis.core.commons.internal.debug;
 
 import java.io.PrintStream;
 import java.util.Map;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.base._With;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._With;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.val;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
index e83ac17..dcfbe95 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.debug;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.debug;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
index e75ed20..f160d20 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataInput;
 import java.io.DataInputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
index dde2bb0..94d97d9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
index 37ada9a..1ab6fa1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
index 7b7cc74..b525809 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataOutput;
 import java.io.DataOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
index d7e9777..d2c3665 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
index bd6469f..af80371 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
index 8dc9e48..b8fc9b5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
index ef9e913..179f3c4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
index 6ffeaed..821b03d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
index 6c0dec0..6950c4d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 public class EncodingConstants {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
index 01e091e..edaa399 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
@@ -20,7 +20,7 @@
 /**
  *
  */
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
index aa549f1..6555be3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
@@ -20,7 +20,7 @@
 /**
  *
  */
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
index 75322c3..ec152e2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
index f65bc85..5fe342c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.environment;
+package org.apache.isis.core.commons.internal.environment;
 
 /**
  * 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
index 611a473..001b18e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.environment;
+package org.apache.isis.core.commons.internal.environment;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -34,9 +34,9 @@ import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.spring.IocContainerSpring;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.spring.IocContainerSpring;
 
 import lombok.Getter;
 import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
index 46ea01a..f8ff8e5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.exceptions;
+package org.apache.isis.core.commons.internal.exceptions;
 
 import java.io.PrintStream;
 import java.util.Collections;
@@ -31,13 +31,13 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._With;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
@@ -76,14 +76,14 @@ public final class _Exceptions {
     public static final IllegalArgumentException illegalArgument(
             final String format,
             final @Nullable Object ... args) {
-        requires(format, "format");
+        _With.requires(format, "format");
         return new IllegalArgumentException(String.format(format, args));
     }
 
     public static IllegalStateException illegalState(
             final String format,
             final @Nullable Object ... args) {
-        requires(format, "format");
+        _With.requires(format, "format");
         return new IllegalStateException(String.format(format, args));
     }
 
@@ -92,7 +92,7 @@ public final class _Exceptions {
     }
 
     public static final NoSuchElementException noSuchElement(String format, Object ...args) {
-        requires(format, "format");
+        _With.requires(format, "format");
         return noSuchElement(String.format(format, args));
     }
 
@@ -208,7 +208,7 @@ public final class _Exceptions {
         if(ex==null) {
             return Stream.empty();
         }
-        return stream(ex.getStackTrace())
+        return _NullSafe.stream(ex.getStackTrace())
                 .map(StackTraceElement::toString)
                 .limit(maxLines);
     }
@@ -220,7 +220,7 @@ public final class _Exceptions {
      * @param maxLines
      */
     public static void dumpStackTrace(PrintStream writer, int skipLines, int maxLines) {
-        stream(Thread.currentThread().getStackTrace())
+        _NullSafe.stream(Thread.currentThread().getStackTrace())
         .map(StackTraceElement::toString)
         .skip(skipLines)
         .limit(maxLines)
@@ -285,7 +285,7 @@ public final class _Exceptions {
             return false;
         }
         for (String message : messages) {
-            if(_Strings.isNotEmpty(message) 
+            if(_Strings.isNotEmpty(message)
                     && throwableMessage.contains(message)) {
                 return true;
             }
@@ -308,7 +308,7 @@ public final class _Exceptions {
         private final E cause;
 
         private FluentException(E cause) {
-            requires(cause, "cause");
+            _With.requires(cause, "cause");
             this.cause = cause;
         }
 
@@ -327,21 +327,21 @@ public final class _Exceptions {
         }
 
         public void rethrowIf(Predicate<E> condition) throws E {
-            requires(condition, "condition");
+            _With.requires(condition, "condition");
             if(condition.test(cause)) {
                 throw cause;
             }
         }
 
         public void suppressIf(Predicate<E> condition) throws E {
-            requires(condition, "condition");
+            _With.requires(condition, "condition");
             if(!condition.test(cause)) {
                 throw cause;
             }
         }
 
         public void rethrowIfMessageContains(String string) throws E {
-            requires(string, "string");
+            _With.requires(string, "string");
             final boolean containsMessage = getMessage().map(msg->msg.contains(string)).orElse(false);
             if(containsMessage) {
                 throw cause;
@@ -349,7 +349,7 @@ public final class _Exceptions {
         }
 
         public void suppressIfMessageContains(String string) throws E {
-            requires(string, "string");
+            _With.requires(string, "string");
             final boolean containsMessage = getMessage().map(msg->msg.contains(string)).orElse(false);
             if(!containsMessage) {
                 throw cause;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
index c37920f..c11e355 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
index fb8a34b..f1f5de7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
@@ -17,9 +17,9 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class InstanceCreationClassException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
index 4229e56..f8cdf87 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
@@ -17,9 +17,9 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class InstanceCreationException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
index dca2f62..8393a72 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
@@ -17,14 +17,14 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.context._Context;
 
 public final class InstanceUtil {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
index 157d84a..1b74e1c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
@@ -17,9 +17,9 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class UnavailableClassException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
index ca9fa45..a1de1c0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
@@ -18,11 +18,11 @@
  */
 
 /**
- * Provides a {@link org.apache.isis.commons.internal.factory.InstanceUtil utility}
+ * Provides a {@link org.apache.isis.core.commons.internal.factory.InstanceUtil utility}
  * class for instantiating classes, ensuring that
  * they are assignable from a specified interface (if supplied).
  *
  * <p>
  * Used in various places throughout the framework.
  */
-package org.apache.isis.commons.internal.factory;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.factory;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
index c548c5e..726f8a9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
index 849056d..23ad986 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
@@ -16,11 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
 
 import java.util.function.Function;
 
-import org.apache.isis.commons.internal.functions._Functions.IndexAwareFunction;
+import org.apache.isis.core.commons.internal.functions._Functions.IndexAwareFunction;
 
 /**
  * Package private mixin for _Functions. <br/>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
index a708e02..9b0b707 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
 
 import java.util.Objects;
 import java.util.function.Predicate;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
similarity index 95%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
index c37920f..d7b8bc1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.functions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
index 45817f2..a721ab5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
 
 /**
  * Top level object classification.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
index aecd551..a37ce0c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
 
 import java.lang.annotation.Annotation;
 import java.util.NoSuchElementException;
@@ -26,8 +26,8 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 /**
  * 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
index 42ac32b..ec1a5e3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 
 /**
  * @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
index 93b9ed6..4becdd3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
 
 import javax.annotation.Priority;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
index dd6e5de..ad1ab6d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
 
 import javax.enterprise.inject.spi.Bean;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 
 import lombok.Value;
 import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
index 815e92f..a768e25 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
 
 import java.util.stream.Stream;
 
 import javax.enterprise.inject.spi.CDIProvider;
 
-import org.apache.isis.commons.internal.context._Plugin;
+import org.apache.isis.core.commons.internal.context._Plugin;
 
 /**
  * No longer used since 2.0.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
index e7fab62..f6e86e9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
@@ -38,15 +38,16 @@ import javax.enterprise.inject.spi.CDIProvider;
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Qualifier;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.functions._Functions.CheckedRunnable;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
@@ -73,7 +74,7 @@ public final class _CDI {
             return;
         }
 
-        requires(onDiscover, "onDiscover");
+        _With.requires(onDiscover, "onDiscover");
 
         // plug in the provider
         final CDIProvider standaloneCDIProvider = CdiPlugin.get().getCDIProvider(onDiscover.get());
@@ -109,7 +110,7 @@ public final class _CDI {
      * @return non-null {@code Bin}
      */
     public static <T> Can<T> select(final Class<T> subType, Collection<Annotation> qualifiers) {
-        if(isEmpty(qualifiers)) {
+        if(_NullSafe.isEmpty(qualifiers)) {
             return select(subType);
         }
 
@@ -141,7 +142,7 @@ public final class _CDI {
      * @return non-null
      */
     public static List<Annotation> filterQualifiers(final Annotation[] annotations) {
-        return stream(annotations)
+        return _NullSafe.stream(annotations)
                 .filter(_CDI::isQualifier)
                 .collect(Collectors.toList());
     }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
index 8f5c49a..b0e32ab 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
 
-import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
+import org.apache.isis.core.commons.internal.functions._Functions.CheckedRunnable;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
index 769a3b3..2fa2189 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
 
 import org.springframework.beans.factory.ObjectProvider;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 
 import lombok.Value;
 import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
index a7733c1..39356b4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
 
 import java.lang.annotation.Annotation;
 import java.util.concurrent.CompletionStage;
@@ -27,7 +27,7 @@ import javax.enterprise.util.TypeLiteral;
 
 import org.springframework.context.ApplicationEventPublisher;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
similarity index 86%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
index 63ce48b..bfda14e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
 
 import java.lang.annotation.Annotation;
 import java.util.Optional;
@@ -28,13 +28,12 @@ import javax.annotation.Nullable;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.ResolvableType;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._With;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -83,7 +82,7 @@ public class IocContainerSpring implements IocContainer {
 
     @Override
     public <T> Can<T> select(final Class<T> requiredType) {
-        requires(requiredType, "requiredType");
+        _With.requires(requiredType, "requiredType");
 
         val allMatchingBeans = springContext.getBeanProvider(requiredType)
                 .orderedStream()
@@ -97,7 +96,7 @@ public class IocContainerSpring implements IocContainer {
             final Class<T> requiredType, 
             @Nullable Set<Annotation> qualifiersRequired) {
 
-        requires(requiredType, "requiredType");
+        _With.requires(requiredType, "requiredType");
 
         if(_NullSafe.isEmpty(qualifiersRequired)) {
             
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
index b2ea841..9baa1fb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
@@ -36,10 +36,10 @@ import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
@@ -142,7 +142,7 @@ public class _Spring {
         if(_NullSafe.isEmpty(annotations)) {
             return Collections.emptySet();
         }
-        return stream(annotations)
+        return _NullSafe.stream(annotations)
                 .filter(_Spring::isGenericQualifier)
                 .collect(Collectors.toSet());
     }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
index ef9ea84..d200e63 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.memento;
+package org.apache.isis.core.commons.internal.memento;
 
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 /**
  * <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
similarity index 81%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
index 5b3a4d1..2d919f6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.memento;
+package org.apache.isis.core.commons.internal.memento;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,16 +31,15 @@ import java.util.Set;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.memento._Mementos.EncoderDecoder;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  *
@@ -65,9 +64,9 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
             SerializingAdapter serializer,
             Map<String, Serializable> valuesByKey) {
 
-        this.codec = requires(codec, "codec");
-        this.serializer = requires(serializer, "serializer");
-        this.valuesByKey = requires(valuesByKey, "valuesByKey");
+        this.codec = _With.requires(codec, "codec");
+        this.serializer = _With.requires(serializer, "serializer");
+        this.valuesByKey = _With.requires(valuesByKey, "valuesByKey");
     }
 
     @Override
@@ -75,7 +74,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
         if(value==null) {
             return this; //no-op, there is no point in storing null values
         }
-        requires(name, "name");
+        _With.requires(name, "name");
         valuesByKey.put(name, serializer.write(value));
         return this;
     }
@@ -108,7 +107,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
     // -- PARSER
 
     static Memento parse(EncoderDecoder codec, SerializingAdapter serializer, @Nullable String str) {
-        requires(codec, "codec");
+        _With.requires(codec, "codec");
         if(_NullSafe.isEmpty(str)) {
             return null;
         }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
index e2f466e..23beec0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.context;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.memento;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
index b7743f5..ec616eb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal;
\ No newline at end of file
+package org.apache.isis.core.commons.internal;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
index 8363c03..1320cd0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins;
+package org.apache.isis.core.commons.internal.plugins;
 
 public class PluginResolveException extends RuntimeException {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
index c73a19a..2c691a2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.core.commons.internal.plugins.codegen;
 
 import java.lang.reflect.InvocationHandler;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
index 59f689d..c47b209 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.core.commons.internal.plugins.codegen;
 
 import javax.annotation.Nullable;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
index 8fbc9bd..73b2276 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
 
 public interface ConversationContextHandle extends AutoCloseable {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
index 78eea53..f89c5bf 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
 
 public interface ConversationContextService {
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
index a61ca95..070bcbd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
 
 /**
  * Acts as a no-op implementation, that is used as lowest priority default, whenever
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
index e1133ea..dd5f885 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
 import org.springframework.util.ReflectionUtils;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
index 64c08f1..92037bd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -32,10 +32,11 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
@@ -306,7 +307,7 @@ public final class _AnnotationsLegacy  {
             Class<?> type, 
             Predicate<Method> filter) {
 
-        return stream(type.getDeclaredMethods())
+        return _NullSafe.stream(type.getDeclaredMethods())
                 .filter(filter)
                 .findFirst()
                 .orElse(null);
@@ -318,7 +319,7 @@ public final class _AnnotationsLegacy  {
             Predicate<Field> filter, 
             Consumer<Field> onField) {
 
-        stream(type.getDeclaredFields())
+        _NullSafe.stream(type.getDeclaredFields())
         .filter(filter)
         .forEach(onField);
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
index bddcb09..af7a906 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
index f208630..8cde5cc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -27,7 +27,7 @@ import java.util.function.Function;
 
 import org.springframework.core.annotation.MergedAnnotations;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 import lombok.Value;
 import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
index 9372bf7..f3c91f7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -37,7 +37,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 
 import lombok.val;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
index 6618481..bab04a5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -24,9 +24,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.isis.commons.internal.context._Context;
-
-import static org.apache.isis.commons.internal.collections._Arrays.emptyToNull;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.collections._Arrays;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -71,7 +70,7 @@ public final class _MethodCache implements AutoCloseable {
             }
         }
         
-        return methodsByKey.get(Key.of(type, name, emptyToNull(paramTypes)));
+        return methodsByKey.get(Key.of(type, name, _Arrays.emptyToNull(paramTypes)));
     }
 
     public int size() {
@@ -90,7 +89,7 @@ public final class _MethodCache implements AutoCloseable {
         private final Class<?>[] paramTypes;
         
         public static Key of(Class<?> type, Method method) {
-            return Key.of(type, method.getName(), emptyToNull(method.getParameterTypes()));
+            return Key.of(type, method.getName(), _Arrays.emptyToNull(method.getParameterTypes()));
         }
         
     }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
index ca0c6de..f37e801 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -43,11 +43,12 @@ import javax.annotation.Nullable;
 
 import org.springframework.core.annotation.AnnotationUtils;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
@@ -75,7 +76,7 @@ public final class _Reflect {
         if(method.getParameterCount()!=superMethod.getParameterCount()) {
             return false;
         }
-        return _Arrays.testAllMatch(method.getParameters(), superMethod.getParameters(), 
+        return _Arrays.testAllMatch(method.getParameters(), superMethod.getParameters(),
                 (p1, p2)->p1.getType().equals(p2.getType()));
     }
 
@@ -94,7 +95,7 @@ public final class _Reflect {
      * @return
      */
     public static <T extends Member> Predicate<T> withName(final String memberName) {
-        requires(memberName, "memberName");
+        _With.requires(memberName, "memberName");
         return m -> m != null && memberName.equals(m.getName());
     }
 
@@ -104,7 +105,7 @@ public final class _Reflect {
      * @return
      */
     public static <T extends Member> Predicate<T> withPrefix(final String prefix) {
-        requires(prefix, "prefix");
+        _With.requires(prefix, "prefix");
         return m -> m != null && m.getName().startsWith(prefix);
     }
 
@@ -123,7 +124,7 @@ public final class _Reflect {
      * @return
      */
     public static <T> Predicate<Field> withTypeAssignableTo(final Class<T> type) {
-        requires(type, "type");
+        _With.requires(type, "type");
         return (Field f) -> f != null && type.isAssignableFrom(f.getType());
     }
 
@@ -143,9 +144,9 @@ public final class _Reflect {
             return Stream.empty();
         }
         if(ignoreAccess) {
-            return stream(type.getDeclaredFields());
+            return _NullSafe.stream(type.getDeclaredFields());
         }
-        return stream(type.getFields());
+        return _NullSafe.stream(type.getFields());
     }
 
     /**
@@ -178,9 +179,9 @@ public final class _Reflect {
             return Stream.empty();
         }
         if(ignoreAccess) {
-            return stream(type.getDeclaredMethods());
+            return _NullSafe.stream(type.getDeclaredMethods());
         }
-        return stream(type.getMethods());
+        return _NullSafe.stream(type.getMethods());
     }
 
     /**
@@ -323,8 +324,8 @@ public final class _Reflect {
             final boolean searchSupers, 
             final boolean ignoreAccess) {
 
-        requires(method, "method");
-        requires(annotationCls, "annotationCls");
+        _With.requires(method, "method");
+        _With.requires(annotationCls, "annotationCls");
         if (!ignoreAccess && !isAccessible(method)) {
             return null;
         }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
index c37920f..e721fb8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.reflection;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
index ef8daf1..8c08c43 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.isis.commons.internal.base._Either;
+import org.apache.isis.core.commons.internal.base._Either;
 
 import lombok.val;
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
index eef52d6..3711689 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,11 +28,10 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.base._With;
 
 /**
  * <h1>- internal use only -</h1>
@@ -57,8 +56,8 @@ public final class _Resources {
      */
     public static InputStream load(Class<?> contextClass, String resourceName) {
 
-        requires(contextClass, "contextClass");
-        requires(resourceName, "resourceName");
+        _With.requires(contextClass, "contextClass");
+        _With.requires(resourceName, "resourceName");
 
         final String absoluteResourceName = resolveName(resourceName, contextClass);
 
@@ -92,7 +91,7 @@ public final class _Resources {
      * @return The resource location as an URL, or null if the resource could not be found.
      */
     public static URL getResourceUrl(Class<?> contextClass, String resourceName) {
-        requires(resourceName, "resourceName");
+        _With.requires(resourceName, "resourceName");
         final String absoluteResourceName = resolveName(resourceName, contextClass);
         return _Context.getDefaultClassLoader().getResource(absoluteResourceName);
     }
@@ -109,7 +108,7 @@ public final class _Resources {
      * @param resourcePath
      */
     public static boolean isLocalResource(String resourcePath) {
-        requires(resourcePath, "resourcePath");
+        _With.requires(resourcePath, "resourcePath");
         return !externalResourcePattern.test(resourcePath);
     }
 
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
index c37920f..3c70d63 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
@@ -25,4 +25,4 @@
  * Do NOT use any of the classes provided by this package!
  * </p>
  */
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.resources;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
index 6835311..6802c6c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.url;
+package org.apache.isis.core.commons.internal.url;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
index 1b16849..6b28d14 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.handlers;
+package org.apache.isis.core.commons.handlers;
 
 import java.util.Arrays;
 
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.apache.isis.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
 
 import lombok.val;
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
index 27b1c00..527f732 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import static org.hamcrest.Matchers.lessThan;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 
 public class BytesTest {
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
index 9d61563..43d6137 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
similarity index 94%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
index 438858e..2a4bbe2 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 public class ReductionTest {
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
index 0a93335..7f5cf05 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
 
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 
 public class StringsTest {
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
similarity index 93%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
index 5cb8f3c..e8b927f 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.cdi;
+package org.apache.isis.core.commons.internal.cdi;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -26,6 +26,7 @@ import javax.annotation.CheckForNull;
 import javax.inject.Inject;
 
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.isis.commons.internal.ioc.cdi._CDI;
+import org.apache.isis.core.commons.internal.ioc.cdi._CDI;
 
 class CDITest {
 
@@ -83,7 +84,7 @@ class CDITest {
 
         //then
         assertNotNull(annotation);
-        assertTrue(_CDI.isQualifier(annotation));
+        Assertions.assertTrue(_CDI.isQualifier(annotation));
 
     }
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
similarity index 95%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
index 47316ef..91f6c60 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.cdi;
+package org.apache.isis.core.commons.internal.cdi;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
index f4d83a9..d2e3c1d 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
index e452534..d20bef6 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
 
 import java.util.HashMap;
 
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 
 import lombok.val;
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
index d659f22..d83abf0 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.collections.snapshot;
+package org.apache.isis.core.commons.internal.collections.snapshot;
 
 import java.util.stream.Collectors;
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
index 66b9fc6..38ab446 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException;
 
 import static org.hamcrest.CoreMatchers.is;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 public class ComparatorsTest {
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
similarity index 96%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
index 84e6d70..664af9c 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
 
 import java.util.concurrent.atomic.LongAdder;
 
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
similarity index 99%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
index 7ab466f..a6a1470 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
similarity index 99%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
index 65fd650..ac1a947 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
index 654ca2a..0cbe64b 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
index c61e84c..2d34cd8 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.commons.internal.strings;
+package org.apache.isis.core.commons.internal.strings;
 
 
 import org.junit.Test;
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index a0bb33e..a8911ae 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -21,7 +21,7 @@ package org.apache.isis.config;
 
 import java.util.List;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index a91d48c..9fca5a7 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -43,8 +43,8 @@ import org.springframework.validation.annotation.Validated;
 import org.apache.isis.applib.annotation.LabelPosition;
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
 import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
 import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
index eb30971..d379ce4 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCommons;
 import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.config.validators.PatternOptionalStringConstraintValidator;
 import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index 073060b..3aa745a 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -36,14 +36,14 @@ import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.Mixin;
 import org.apache.isis.applib.annotation.ViewModel;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.BeanSort;
-import org.apache.isis.commons.internal.reflection._Reflect;
-
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.reflection._Annotations.findNearestAnnotation;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.reflection._Annotations.findNearestAnnotation;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
index cf03343..ba171f6 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
@@ -18,9 +18,9 @@
  */
 package org.apache.isis.config.beans;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
index 5988909..8f0b282 100644
--- a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.messages;
 
 import java.util.List;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 public class MessageRegistry {
 
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
index b9bf8a1..6253934 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.config.metamodel.specloader;
 
-import org.apache.isis.commons.internal.environment.DeploymentType;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.config.IsisConfiguration;
 
 import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
index c11057f..cadfcb9 100644
--- a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.util;
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.ConfigurationConstants;
 
 import lombok.experimental.UtilityClass;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
index 0775644..ac9625d 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
@@ -31,8 +31,8 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 import lombok.Getter;
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
similarity index 92%
rename from core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
index 438b6c2..b9dd308 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -33,12 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.jaxb.JaxbServiceDefault;
-import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
+import org.apache.isis.core.commons.internal.reflection._Reflect.InterfacePolicy;
 import org.apache.isis.metamodel.services.user.UserServiceDefault;
 
-import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamTypeHierarchy;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.getAnnotation;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllMethods;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.streamTypeHierarchy;
 
 //TODO we are using real world classes from the framework, we could instead isolate these tests
 // if we provide some custom classes for hierarchy traversal here (could be nested); 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index 634a1fc..cee8c6a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.unittestsupport.bidir;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
index bd6081f..e0cf993 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.unittestsupport.comparable;
 
-import static org.apache.isis.commons.internal.base._NullSafe.compareNullsFirst;
+import static org.apache.isis.core.commons.internal.base._NullSafe.compareNullsFirst;
 
 public class CategorizedDomainObject implements Comparable<CategorizedDomainObject> {
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index 3639639..4ba68a5 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
 
 class ImposteriserTestUsingCodegenPlugin {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
index 64783c0..ff08169 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.adapter.oid;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class ObjectPersistenceException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
index d8a935b..355e4f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
@@ -25,14 +25,14 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 
-import static org.apache.isis.commons.internal.base._Strings.splitThenStream;
+import static org.apache.isis.core.commons.internal.base._Strings.splitThenStream;
 
 /**
  * Factory for subtypes of {@link Oid}, based on their oid str.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
index b4c3640..4c1523a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
@@ -24,7 +24,7 @@ import java.util.Objects;
 
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 final class Oid_Parented implements ParentedOid {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
index d4794ad..fc6dc08 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.adapter.oid;
 import java.util.Objects;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 import org.apache.isis.schema.common.v1.BookmarkObjectState;
 import org.apache.isis.schema.common.v1.OidDto;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
index b84c7d3..d667023 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.adapter.oid;
 
 import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
 import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
 
 /**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
index 812dbe2..a1bc037 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.adapter.oid;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
 import org.apache.isis.schema.common.v1.OidDto;
 
 public interface RootOid extends Oid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
index 6aae478..5d51eeb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public final class ArrayExtensions {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
index 245cf38..ebd190a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
@@ -25,10 +25,10 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
index 4641610..0ca3c73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
index 79e389e1..a04a7b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
@@ -24,10 +24,10 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 public final class ListExtensions {
     private static final String DEFAULT_DELIMITER = ",";
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
index f879243..0f67f40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.commons;
 
 import java.util.Locale;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 
 public class LocaleUtil {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
index ed92b7d..b88a8cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
@@ -26,12 +26,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
 
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
index 2f7c762..6489f9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 
 /**
  * Helpers to co-erce non-generic values into type-safe generics without
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
index 8892ea2..a6dcd1a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
 
 public class ResourceUtil {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
index c5c644f..1d2dd47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.isis.applib.util.Enums;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 public final class StringExtensions {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
index 87e8b86..cf77e5f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
@@ -24,7 +24,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.function.Consumer;
 
 import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.specloader.ReflectiveActionException;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
index d8a8238..c7d5b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.consent;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.interactions.InteractionAdvisorFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
index feee12a..e4b9882 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.consent;
 
 import org.apache.isis.metamodel.facetapi.Facet;
 
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
 
 public class Veto extends ConsentAbstract {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
index ca84ccd..03c3268 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
@@ -20,7 +20,6 @@ package org.apache.isis.metamodel.context;
 
 import java.util.stream.Stream;
 
-import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -28,7 +27,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.services.homepage.HomePageAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
index 6f5a906..d00dd34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
@@ -23,7 +23,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -31,11 +30,11 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.services.ServiceUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
index 8353664..4f655c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 
 /**
  * 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
index 4cc4155..266e73d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.exceptions;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class MetaModelException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
index 2aede02..23f6e4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.exceptions.persistence;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 public class ObjectPersistenceException extends IsisException {
     private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
index 4d0375d..c97a0c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
@@ -24,11 +24,11 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.context.MetaModelContext;
 
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
 
 import lombok.Setter;
 import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
index 7276254..d31d7ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
@@ -23,14 +23,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Maps.AliasMap;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps.AliasMap;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
index 80b939e..d09d748 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
@@ -44,16 +44,16 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.reflection._Annotations;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 import org.apache.isis.metamodel.commons.MethodUtil;
 import org.apache.isis.metamodel.commons.ThrowableExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 public final class Annotations  {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
index 2832af7..6f7ed64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
@@ -36,11 +36,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._With;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._With;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
index cd760e0..1e62fd0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
 import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
 
 import lombok.Builder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
index 950ac40..5257176 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
 import org.apache.isis.applib.events.domain.CollectionDomainEvent;
 import org.apache.isis.applib.events.domain.PropertyDomainEvent;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.services.events.MetamodelEventService;
 import org.apache.isis.metamodel.spec.ManagedObject;
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
index b7122c6..2915b33 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
@@ -27,8 +27,8 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
 import org.apache.isis.metamodel.commons.CanBeVoid;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
index ec54633..fbbbc13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
@@ -25,8 +25,8 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
index a8529a5..efa52c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.ObjectMember;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
index 343f277..f3ff17e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
@@ -29,7 +29,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.reflection._MethodCache;
+import org.apache.isis.core.commons.internal.reflection._MethodCache;
 import org.apache.isis.metamodel.commons.MethodUtil;
 import org.apache.isis.metamodel.facetapi.MethodRemover;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
index 3f8184b..8e7ebf6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
 import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 72d87ec..c2bdcce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -19,14 +19,12 @@
 package org.apache.isis.metamodel.facets;
 
 import java.util.EnumSet;
-import java.util.function.Consumer;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.Contributed;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
index 14f923d..6b183b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
index b2676d8..f54129b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets;
 
 import java.util.EnumSet;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 
 public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
index c430b86..d304446 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
@@ -26,8 +26,8 @@ import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacet;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index ba47ac8..316ab5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -24,8 +24,8 @@ import java.util.Optional;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.events.domain.ActionDomainEvent;
 import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
index 21c2b9c..180c04d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.actions.action.invocation;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 7d6a057..71fc7df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -47,12 +47,12 @@ import org.apache.isis.applib.services.metamodel.MetaModelService.Mode;
 import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.metamodel.commons.MethodInvocationPreprocessor;
 import org.apache.isis.metamodel.commons.ThrowableExtensions;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
index 9892069..dc29117 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
@@ -22,9 +22,8 @@ package org.apache.isis.metamodel.facets.actions.action.invocation;
 import java.util.List;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index e8c628a..cac90e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.RestrictTo;
-import org.apache.isis.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacet;
 import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
index 675b3a9..c5f8f93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.actions.defaults.method;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
index 6d67fc9..67989c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.fileaccept;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 60d874c..b8a8733 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.HomePage;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
 
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
index 3c5c54d..9d2c008 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
index 2e8cc31..5d9b8df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.actions.layout;
 
 import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
index 01a8a89..0c31ee1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
index eb9ad31..6314ee8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.actions.layout;
 
 import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
index 600a4a3..23ee662 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
index 78b223c..fdb5bba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.actions.layout;
 
 import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
index cfd7087..ee47a11 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
index 06e5f3c..a44c896 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.actions.layout;
 
 import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index 73dd3c6..9de5811 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.prototype;
 import java.util.Map;
 
 import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
index 898d96e..e9f81c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.actions.validate;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
 import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
index b38f5f9..4f134f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
@@ -26,7 +26,6 @@ import java.util.Map;
 
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
index ac6cf75..0b317a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.validate.method;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
index 42ed32b..9371761 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
@@ -25,11 +25,11 @@ import java.util.Map;
 import java.util.function.Consumer;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
-import static org.apache.isis.commons.internal.base._With.computeIfAbsent;
+import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
 
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
index e27b8c5..1feb3fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.facets.all.i18n;
 
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
index dfab40c..b4ec364 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
index 62ffd1f..e5d7b4c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.CanBeVoid;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
index 0b8e22a..0d23f4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.collections.clear;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 7db9dea..f7117a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -27,7 +27,7 @@ import java.util.Optional;
 import org.apache.isis.applib.annotation.Collection;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.events.domain.CollectionDomainEvent;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
index 4392bc7..ff3d01d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public abstract class CollectionAddToFacetForDomainEventFromAbstract
 extends SingleValueFacetAbstract<Class<? extends CollectionDomainEvent<?,?>>>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 7f31d2f..6f5e096 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
 import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
 import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.facets.DomainEventHelper;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
index 7d4f8d6..76e2f39 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.isis.applib.events.domain.AbstractDomainEvent;
 import org.apache.isis.applib.events.domain.CollectionDomainEvent;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -35,7 +35,7 @@ import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromF
 import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 
 public abstract class CollectionRemoveFromFacetForDomainEventFromAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
index 8e670a3..49bcc35 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
@@ -19,8 +19,8 @@
 
 package org.apache.isis.metamodel.facets.collections.javautilcollection;
 
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index 71fe7d7..ff47cc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -22,14 +22,14 @@ package org.apache.isis.metamodel.facets.collections.javautilcollection;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.CollectionFacetAbstract;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-import static org.apache.isis.commons.internal.collections._Arrays.toArray;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.collections._Arrays.toArray;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index ae6fb43..016ca9b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.CollectionFacetAbstract;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
index 41616eb..4435aa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
index f557e26..fcb992d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.layout;
 
 import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index a452bc7..5a5d020 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
index 535ecd6..0d7ee2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.layout;
 
 import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
index 5af3f75..b4734df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
index a19fd49..7449d4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.layout;
 
 import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
index cb6d53b..17ac6ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
index d7e0475..66acbe3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.layout;
 
 import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 994ca89..2c0e8fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
 import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public class SortedByFacetForCollectionLayoutAnnotation extends SortedByFacetAbstract {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index 8b1b54f..d27ea6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
 import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
index 3533eb3..ddcc3fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.modify;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
index 18434a6..9d3bce2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
@@ -25,7 +25,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
index 081e628..45ee5f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.MethodUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
index 4f35306..5ec5de2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
@@ -23,8 +23,8 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleStringValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
index 68cca14..2c83154 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.cssclassfa.annotprop;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
 import org.apache.isis.metamodel.specloader.specimpl.ObjectMemberAbstract;
 
 import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
index 60ea5df..14c4129 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.disabled;
 import java.util.Map;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index b692ad6..1188c8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index 562d659..77e287f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.disabled.method;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
index c7c6205..32cd9c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.hidden;
 import java.util.Properties;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
index 23052a6..20325bc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index 7980d8f..98c7766 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.members.hidden.method;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
index 241b9e7..92834c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.order;
 import java.util.Map;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
index 2381722..e542129 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.object.callbacks;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.MethodFinderUtils;
 import org.apache.isis.metamodel.facets.MethodLiteralConstants;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
index d0bbb02..8f41e5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
 import org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
index dc6f771..4dca20d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.MethodFinderUtils;
 import org.apache.isis.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
index d3ce827..67eb463 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
index 0b99dd2..57bfe85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
index 6c6e976..b014d9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
index 6e93bf4..9dac54d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
index 67cac82..8681d40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
index 8e9047d..869ac40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
index 174b731..771d5a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
index e278508..65a8367 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
index 6967839..5771c40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
index 4bc7d91..12861ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
index e4c12a8..5139d2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.Wormhole;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
index f8ecdc6..5eeb69e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
index a913a5c..8ee0b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.object.choices.enums;
 
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
index d6a0ea1..1611baf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.cssclass.method;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.MethodFinderUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
index 06efd1c..94669aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
@@ -18,7 +18,7 @@
 package org.apache.isis.metamodel.facets.object.cssclassfa.annotation;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
index bdda591..34e26ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
@@ -18,7 +18,7 @@
 package org.apache.isis.metamodel.facets.object.cssclassfa.annotation;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
index 19dbc10..419b689 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.defaults;
 
 import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
index e99f755..847a43c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
 
 import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
index f09c6db..e83d1d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
 
 import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.Annotations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
index 5b34e1e..6f1f80b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.disabled.method;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 4fe237e..ed6f660 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
 import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
 import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
 import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index fe55eb9..c917222 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.auditing;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Auditing;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 00bc18c..a0eb9fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
index c393485..b33c791 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.editing;
 
 import java.util.Map;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
index ad66031..23f6d91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.objectspecid;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
index 4485aa6..1eb7ef6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
index 91f2f2d..4f6c61e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
index 719e1f7..9d86f9b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
index e516c28..8c60752 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
index 86d2df5..82e0886 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
index b919bb9..99c9bb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index dcc949f..b973974 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index e4a4e04..c3bcf28 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
index 247b240..70cd731 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
index 46ffdec..114cb6b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
index 90f9a3b..9a6744c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 52a37f5..4fed04b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -18,7 +18,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.services.events.MetamodelEventService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index cda77d8..1854a705 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index 2869350..0f0fe83 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
index f4a847f..98d8c58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
index a91ede5..a286e90 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
index 64d4479..2c2f35d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
index cefeff3..4851ea0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
@@ -19,7 +19,7 @@
 package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
 import org.apache.isis.metamodel.facets.object.plural.PluralFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
index d5c7326..34a8a3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
 import org.apache.isis.metamodel.facets.object.plural.PluralFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 11d8a48..e500f85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index 497f3fd..f995a58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index eb27155..786eb8a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.object.domainservicelayout.annotation.DomainServiceLayoutFacetAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
index 0e29159..b2263b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.encodeable.encoder;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
-import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.assertions._Assert;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
index 809654d..3dd07bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
index 4803106..f362229 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
@@ -17,7 +17,7 @@
 package org.apache.isis.metamodel.facets.object.grid;
 
 import org.apache.isis.applib.services.grid.GridService;
-import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
index a7c859a..88a5784 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.hidden.method;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
index abf5a04..3eb5f8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.icon.method;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index f775735..6ecb035 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -28,15 +28,15 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.MethodRemover;
 import org.apache.isis.metamodel.facets.Annotations;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
index a0f8840..d560e17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.object.ignore.datanucleus;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index 7323b1f..b55440f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.ClassExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
index 4392d7f..0082af3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.ignore.jdo;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
index d5fc851..c2cc832 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.layout;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.MethodFinderUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
index 9d37775..01ff508 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
@@ -19,7 +19,7 @@
 package org.apache.isis.metamodel.facets.object.mixin;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorForValidationFailures;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
index 1e67e52..eeffe6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
index f8aaad2..fd8530a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Constructor;
 
 import org.apache.isis.applib.annotation.Mixin;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index 716a876..9b6471f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
index a63698b..33c4002 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
@@ -23,7 +23,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.navparent.NavigableParentFacetAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
index 0f9c687..998a69b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.object.parseable;
 
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 
 /**
  * Indicates that a value entry is not valid. Note the entry may still parse
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
index 4d64aff..e3ff986 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public final class ParserUtil {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
index 2f8063e..39d5db5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.object.parseable;
 
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 
 /**
  * Indicates that a text entry could not be satisfactorily parsed into a useful
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index 42785bc..dcb043f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.recreatable;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.PostConstructMethodCache;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index fb80a32..3652f5d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.isis.applib.RecreatableDomainObject;
 import org.apache.isis.applib.ViewModel;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
index 0367f12..58f6541 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 06d8065..7fea1f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -25,8 +25,8 @@ import java.util.Objects;
 import java.util.function.Function;
 
 import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.Annotations;
 import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
index da2bcfd..f5e7ec4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.title.methods;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.ClassExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
index addc9bc..9187a3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.validating.validateobject.method
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
index 8710c70..54f939e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.object.value.annotcfg;
 
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.ValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
index 5073cd1..1d6b05a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.value.annotcfg;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index be6f4f1..3e0f78b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.commons.LocaleUtil;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index ff3de3c..b14d26c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -20,12 +20,12 @@
 package org.apache.isis.metamodel.facets.object.value.vsp;
 
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 public final class ValueSemanticsProviderUtil {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
index 75bff6c..ad01336 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.objectvalue.mandatory;
 import java.util.Map;
 
 import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
index 2c382aa..d2868da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
 import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
index bea5de8..b46dbb4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.autocomplete;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index 38ab87b..ec984c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
index 2a7bf97..ce2ef7f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.param.autocomplete.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
index 0032dbf..ca17177 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.choices;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
index e380b79..4a3ed63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.choices;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
index 48cb14c..c5f138c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
@@ -21,8 +21,7 @@ package org.apache.isis.metamodel.facets.param.choices.enums;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.TypedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index f7d1a94..e4403d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
index 7f239e2..7c25b00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.param.choices.method;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index ba626b7..9bff8cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
index e51e1f1..7323df6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.param.choices.methodnum;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
index 1c5c847..91b148c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.defaults;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index 9311426..43c4736 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
index f945dfa..1e48ba1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.param.defaults.methodnum;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Arrays;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
index 94c3b42..8b29a57 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.disable;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
index 74db06c..043af12 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
@@ -26,7 +26,6 @@ import java.util.Map;
 
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.param.disable.ActionParameterDisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
index 8031125..21a2850 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.param.disable.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
index 1f802c6..69aa639 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.hide;
 
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
index 6782ad2..dafa9fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.param.hide.ActionParameterHiddenFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
index 4ff9a0f..311c2cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.param.hide.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
index 9f5a917..652b274 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
index 5d0ed06..1f374d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
index 60f5dbe..642bfc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
index eb0a2ee..e1b6fe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.parameter.fileaccept;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
index 7c3a876..de3fc15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
 import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
index 6fcb3f9..ef2023d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.parameter.regex;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.Annotations;
 import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
index e3e0c07..c074df6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.validate.method;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
index 8392f58..a33a74f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.properties.accessor;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.CanBeVoid;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index c172cd7..bdb7b62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
index 2d127ee..eee3e50 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.properties.autocomplete.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index 0649ae8..f49d819 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.properties.choices.enums;
 
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
index 789d518..85b1062 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.properties.choices.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index b8d5c71..bf78038 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
index 052010b..289beb1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.properties.defaults.method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
index d133fb6..71f7489 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.property.fileaccept;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
 import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 69a2610..86c63d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
 import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
 import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.facets.DomainEventHelper;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 7eb76f4..046678c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.command.spi.CommandService;
 import org.apache.isis.applib.services.iactn.Interaction;
 import org.apache.isis.applib.services.iactn.InteractionContext;
 import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -48,7 +48,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.schema.ixn.v1.PropertyEditDto;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
index c4ef306..141b690 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.Annotations;
 import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
index db4250f..5518ded 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.Annotations;
 import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
index ce66195..b08644f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
index 7657fad..01a7604 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.properties.propertylayout;
 
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
index b4c1129..c95bbe7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
index a55a59d..257e50d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.properties.propertylayout;
 
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
 import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
index 92b13bf..78e0943 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
index 616ef04..e5b4475 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.properties.propertylayout;
 
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
index 55fdf3c..4f76728 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.properties.update;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
index 38e1982..90f4ab0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.properties.update;
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
index 7977593..2395c51 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.validating.method;
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index d4ba883..ca53ba0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 14a780f..0218d32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -31,8 +31,8 @@ import java.util.StringTokenizer;
 import java.util.TimeZone;
 
 import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index e343de0..2e6e038 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
index 25920f7..ac463a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
@@ -29,8 +29,8 @@ import org.apache.isis.applib.adapters.DefaultsProvider;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.Blob;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index 322eb90..3a56f90 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.value.booleans;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index 730b02d..609c0c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index 48b3dfb..fee9048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
index 22eef7f..bc602b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormatter;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.metamodel.facets.value.JodaFunctions;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index d46833a..abccad3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -30,8 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index d24a7d3..958c22b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -29,8 +29,8 @@ import org.joda.time.format.ISODateTimeFormat;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
index 52185cf..636597c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index 308d500..bf2b0ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
index ce2d2fb..b6cf881 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
 import org.joda.time.LocalDateTime;
 import org.joda.time.format.DateTimeFormatter;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.metamodel.facets.value.JodaFunctions;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index e1d4202..fdd6d5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -31,8 +31,8 @@ import org.joda.time.format.ISODateTimeFormat;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
index a23650c..a756681 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
@@ -26,8 +26,8 @@ import java.awt.image.MemoryImageSource;
 import java.awt.image.PixelGrabber;
 
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
index 4be75cc..871094c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
@@ -28,7 +28,7 @@ import java.util.Map;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.time.TimeValueSemanticsProviderAbstract;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
index e036c94..e97f9ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.InvalidEntryException;
 import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
index 2db001a..16bc92f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
 import org.apache.isis.applib.tree.LazyTreeNode;
 import org.apache.isis.applib.tree.TreeNode;
 import org.apache.isis.applib.tree.TreeState;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
index 8d34fa2..a21c1b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
-import org.apache.isis.commons.internal.base._Tuples;
-import org.apache.isis.commons.internal.base._Tuples.Indexed;
+import org.apache.isis.core.commons.internal.base._Tuples;
+import org.apache.isis.core.commons.internal.base._Tuples.Indexed;
 import org.apache.isis.metamodel.consent.InteractionContextType;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
index 89bf4fa..f7fdb26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
@@ -29,9 +29,9 @@ import java.util.SortedSet;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.facets.FacetedMethod;
 import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
index 85545ec..f3d4a34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.layout.memberorderfacet;
 
 import java.util.Comparator;
 
-import org.apache.isis.commons.internal.compare._Comparators;
+import org.apache.isis.core.commons.internal.compare._Comparators;
 import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
 
 public class MemberOrderFacetComparator implements Comparator<MemberOrderFacet> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
index fc21161..2aea332 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
@@ -19,9 +19,9 @@
 
 package org.apache.isis.metamodel.objectmanager.create;
 
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index 43228a3..8c7ba9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -24,9 +24,9 @@ import java.lang.reflect.Modifier;
 import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
 import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facets.object.callbacks.CallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
index 66630d5..1a2894c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
@@ -19,9 +19,9 @@
 
 package org.apache.isis.metamodel.objectmanager.identify;
 
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index f6cd557..5f8a4f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.objectmanager.identify;
 
 import java.util.UUID;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.config.ConfigurationConstants;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
index 6ca438a..67f447f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
@@ -19,9 +19,9 @@
 
 package org.apache.isis.metamodel.objectmanager.load;
 
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
index 81ca9b4..6341e1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
@@ -21,9 +21,9 @@ package org.apache.isis.metamodel.objectmanager.load;
 import java.lang.reflect.Array;
 import java.lang.reflect.Modifier;
 
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
 import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
index bd1a572..34786e5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
@@ -18,9 +18,9 @@
  */
 package org.apache.isis.metamodel.objectmanager.refresh;
 
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.spec.ManagedObject;
 
 import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
index c1f5d98..a037a49 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.objectmanager.refresh;
 
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
index 64ab2ce..e9c1987 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.function.Function;
 
 import org.apache.isis.applib.ApplicationException;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 51dcb61..ef4d517 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -28,8 +28,8 @@ import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.events.domain.ActionDomainEvent;
 import org.apache.isis.applib.events.domain.CollectionDomainEvent;
 import org.apache.isis.applib.events.domain.PropertyDomainEvent;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
index 8ba832d..90036b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
@@ -23,7 +23,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.functions._Functions;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
index 128a2e7..affba80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
@@ -25,10 +25,10 @@ import java.util.List;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Multimaps;
-import org.apache.isis.commons.internal.collections._Multimaps.SetMultimap;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Multimaps;
+import org.apache.isis.core.commons.internal.collections._Multimaps.SetMultimap;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
index 0ae5bd4..ac993f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
@@ -23,12 +23,12 @@ import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 
-import org.apache.isis.commons.internal.functions._Predicates;
+import org.apache.isis.core.commons.internal.functions._Predicates;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
 
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index bc5ca80..cc531da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.metamodel.authorization.standard.AuthorizationFacetFactory;
 import org.apache.isis.metamodel.facets.OrphanedSupportingMethodValidator;
 import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index e9ee83e..7d57380 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -35,11 +35,11 @@ import org.springframework.core.MethodParameter;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ToString;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
index 3304d24..3b32fe5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.services;
 
-import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.assertions._Assert;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
index 39765bd..72f3b0b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.util.Equality;
 import org.apache.isis.applib.util.Hashing;
 import org.apache.isis.applib.util.ObjectContracts;
 import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Sets;
 
 /**
  * Canonical application feature, identified by {@link ApplicationFeatureId},
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
index ce08670..9bbec70 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -39,9 +39,9 @@ import org.apache.isis.applib.util.Hashing;
 import org.apache.isis.applib.util.ObjectContracts;
 import org.apache.isis.applib.util.TitleBuffer;
 import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 
 /**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 28e0493..75369bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -37,10 +37,10 @@ import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
 import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -59,7 +59,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index e3a32c1..1d23a26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.services.classsubstitutor;
 import java.util.Set;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Blackhole;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Blackhole;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ProxyEnhanced;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index d2d5cff..2bc06c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 /**
  * Aggregates all {@link ClassSubstitutor}s.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
index fb16ced..2078c61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.command;
 import java.util.List;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
index 5c230b7..0b1baf5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.events.ui.CssClassUiEvent;
 import org.apache.isis.applib.events.ui.IconUiEvent;
 import org.apache.isis.applib.events.ui.LayoutUiEvent;
 import org.apache.isis.applib.events.ui.TitleUiEvent;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.core.commons.internal.ioc.spring._Spring;
 
 @Configuration
 @Named("isisMetaModel.MetamodelEventSupport_Spring")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
index aec6f5c..3a6134c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -36,10 +36,10 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.services.grid.GridLoaderService;
 import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.resources._Resources;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
index fe883fd..a93e13a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -35,8 +35,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.services.grid.GridSystemService;
 import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
 
 /**
  * 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
index d96bced..60099fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.services.grid.GridLoaderService;
 import org.apache.isis.applib.services.grid.GridService;
 import org.apache.isis.applib.services.grid.GridSystemService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 @Service
 @Named("isisMetaModel.GridServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
index d4a9a34..dbcb663 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -51,10 +51,10 @@ import org.apache.isis.applib.services.grid.GridSystemService;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index adbc039..e3bdc0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -50,12 +50,12 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
 import org.apache.isis.applib.layout.grid.bootstrap3.Size;
 import org.apache.isis.applib.mixins.MixinConstants;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.resources._Resources;
 import org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet;
 import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
@@ -69,7 +69,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
index 079d111..be84b4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.homepage;
 import java.util.Collections;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
index bc829fe..b542a91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.ixn;
 import java.util.List;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.collections.Can;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index f4aa4c7..b1ec43e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.layout.LayoutService;
 import org.apache.isis.applib.services.menu.MenuBarsService;
 import org.apache.isis.applib.util.ZipWriter;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facets.object.grid.GridFacet;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
index ba0c7f7..0bee40f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.isis.applib.services.metamodel.DomainMember;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.ImperativeFacet;
 import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
index cd88934..1a26842 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.isis.applib.services.metamodel.DomainMember;
 import org.apache.isis.applib.services.metamodel.DomainModel;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 @XmlRootElement(name="domain")
 @XmlAccessorType(XmlAccessType.PROPERTY)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
index 006955d..7e1f491 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
@@ -31,9 +31,9 @@ import org.apache.isis.applib.services.command.CommandDtoProcessor;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
 import org.apache.isis.applib.spec.Specification;
 import org.apache.isis.applib.util.schema.CommonDtoUtils;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
index fd0fcd3..334f892 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.grid.GridService;
 import org.apache.isis.applib.services.metamodel.DomainMember;
 import org.apache.isis.applib.services.metamodel.DomainModel;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
 import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
index 05c8eff..a537b5f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
@@ -34,13 +34,13 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.ioc.spring._Spring;
 import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
 
 import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
index 696b706..526f1f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.services.title;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.commons.internal.base._Blackhole;
+import org.apache.isis.core.commons.internal.base._Blackhole;
 import org.apache.isis.config.messages.MessageRegistry;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
 import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
index 97a7b05..01eb4e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.security.RoleMemento;
 import org.apache.isis.applib.security.UserMemento;
 import org.apache.isis.applib.services.sudo.SudoService;
 import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
 
 import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
index af456e4..14cc4ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.spec;
 
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
 
 /**
  * Thrown when a problem is found with the domain model, and Isis cannot
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index 03d11a4..65589bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -33,11 +33,11 @@ import javax.annotation.Nullable;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.domain.DomainObjectList;
-import org.apache.isis.commons.internal.base._Tuples.Indexed;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Tuples.Indexed;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.metamodel.commons.ClassExtensions;
 import org.apache.isis.metamodel.commons.MethodExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
index b255be0..0ae7b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
 
 import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
 
 import lombok.AccessLevel;
 import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
index ae17d36..e4de7d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
@@ -26,9 +26,9 @@ import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.collections._Streams;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.collections._Streams;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.consent.InteractionResult;
@@ -50,7 +50,6 @@ import org.apache.isis.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.metamodel.interactions.InteractionContext;
 import org.apache.isis.metamodel.interactions.ObjectTitleContext;
 import org.apache.isis.metamodel.interactions.ObjectValidityContext;
-import org.apache.isis.metamodel.services.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.metamodel.spec.feature.Contributed;
 import org.apache.isis.metamodel.spec.feature.ObjectActionContainer;
 import org.apache.isis.metamodel.spec.feature.ObjectAssociationContainer;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
index 478b6ce..8a8eba7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
@@ -35,10 +35,10 @@ import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.value.Blob;
 import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.context.MetaModelContext;
@@ -57,7 +57,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.specimpl.MixedInMember;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
index df5c0ee..6001175 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
@@ -23,11 +23,11 @@ import java.util.Collection;
 import java.util.stream.Stream;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.spec.ActionType;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 public interface ObjectActionContainer {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
index fb480d7..f4fa0fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
@@ -25,7 +25,7 @@ import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import javax.enterprise.inject.Vetoed;
 
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
index d782f6f..4cc87b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
@@ -29,10 +29,10 @@ import java.util.stream.Stream;
 import javax.enterprise.inject.Vetoed;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
... 6070 lines suppressed ...


[isis] 01/21: ISIS-2259: revert, renames isis-core-applib back to isis-applib

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

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

commit d3fdb9d75bf6eef49e9f5ad1bf42816ae484691f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:57:58 2020 +0000

    ISIS-2259: revert, renames isis-core-applib back to isis-applib
---
 core/applib/pom.xml                        | 2 +-
 core/config/pom.xml                        | 4 ++--
 core/metamodel/pom.xml                     | 4 ++--
 core/persistence/jdo/applib/pom.xml        | 2 +-
 core/pom.xml                               | 4 ++--
 core/runtime/pom.xml                       | 2 +-
 core/security/api/pom.xml                  | 2 +-
 core/viewers/restfulobjects/applib/pom.xml | 2 +-
 extensions/vw/pdfjs/applib/pom.xml         | 2 +-
 extensions/vw/pdfjs/fixtures/pom.xml       | 2 +-
 legacy/extensions/core/applib/pom.xml      | 2 +-
 legacy/extensions/core/commons/pom.xml     | 2 +-
 legacy/extensions/core/metamodel/pom.xml   | 2 +-
 legacy/extensions/core/runtime/pom.xml     | 2 +-
 mappings/restclient/api/pom.xml            | 2 +-
 mavendeps/webapp/pom.xml                   | 2 +-
 subdomains/base/applib/pom.xml             | 2 +-
 subdomains/docx/applib/pom.xml             | 2 +-
 subdomains/excel/applib/pom.xml            | 2 +-
 subdomains/excel/fixture/pom.xml           | 2 +-
 subdomains/excel/integtests/pom.xml        | 2 +-
 subdomains/freemarker/applib/pom.xml       | 2 +-
 subdomains/ognl/applib/pom.xml             | 2 +-
 subdomains/pdfbox/applib/pom.xml           | 2 +-
 subdomains/spring/applib/pom.xml           | 2 +-
 subdomains/xdocreport/applib/pom.xml       | 2 +-
 subdomains/zip/applib/pom.xml              | 2 +-
 testing/fakedata/applib/pom.xml            | 2 +-
 testing/fakedata/fixtures/pom.xml          | 2 +-
 testing/unittestsupport/applib/pom.xml     | 2 +-
 valuetypes/asciidoc/applib/pom.xml         | 2 +-
 valuetypes/markdown/applib/pom.xml         | 2 +-
 32 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index dd06976..4964ca3 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -26,7 +26,7 @@
         <version>2.0.0-M3-SNAPSHOT</version>
     </parent>
 
-    <artifactId>isis-core-applib</artifactId>
+    <artifactId>isis-applib</artifactId>
 
     <name>Apache Isis Core - AppLib</name>
     <description>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index b670cbe..c0e9316 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -61,7 +61,7 @@
     
     	<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
     	<dependency>
             <groupId>org.apache.isis.core</groupId>
@@ -89,7 +89,7 @@
 
         <dependency>
         	<groupId>org.apache.isis.core</groupId>
-        	<artifactId>isis-core-applib</artifactId>
+        	<artifactId>isis-applib</artifactId>
         	<type>test-jar</type>
         </dependency>
 
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index cda8e47..784478f 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -66,7 +66,7 @@
     
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
@@ -117,7 +117,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index 1755124..d6e5978 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -71,7 +71,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index df572e7..ad9c4b7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -706,14 +706,14 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-applib</artifactId>
+				<artifactId>isis-applib</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>jar</type>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-applib</artifactId>
+				<artifactId>isis-applib</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>test-jar</type>
 				<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 23f9ad4..7e4f6eb 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -75,7 +75,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/core/security/api/pom.xml b/core/security/api/pom.xml
index b6c28a6..efc15a1 100644
--- a/core/security/api/pom.xml
+++ b/core/security/api/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index de49c2c..6380215 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -40,7 +40,7 @@
 		
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/extensions/vw/pdfjs/applib/pom.xml b/extensions/vw/pdfjs/applib/pom.xml
index f21a461..ff14ea4 100644
--- a/extensions/vw/pdfjs/applib/pom.xml
+++ b/extensions/vw/pdfjs/applib/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/extensions/vw/pdfjs/fixtures/pom.xml b/extensions/vw/pdfjs/fixtures/pom.xml
index a58a4b3..e36cb4a 100644
--- a/extensions/vw/pdfjs/fixtures/pom.xml
+++ b/extensions/vw/pdfjs/fixtures/pom.xml
@@ -94,7 +94,7 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
     <dependencies>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index cff156a..2d1b4e3 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -54,7 +54,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 68eff64..67d516a 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -54,7 +54,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 00072d3..5eb718a 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -53,7 +53,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 0cfe884..d61c256 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -53,7 +53,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		
diff --git a/mappings/restclient/api/pom.xml b/mappings/restclient/api/pom.xml
index 22ac477..80048a1 100644
--- a/mappings/restclient/api/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -34,7 +34,7 @@
 	
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 6bc92d2..9af814b 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -67,7 +67,7 @@
 		<!-- ISIS API -->
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/subdomains/base/applib/pom.xml b/subdomains/base/applib/pom.xml
index e165860..f267c40 100644
--- a/subdomains/base/applib/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -21,7 +21,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/subdomains/docx/applib/pom.xml b/subdomains/docx/applib/pom.xml
index 125836b..842f7b8 100644
--- a/subdomains/docx/applib/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -31,7 +31,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 <!--
 		<dependency>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index bb3d869..7e2a908 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 88dd327..3c54576 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -66,7 +66,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index b21e32a..060ff40 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -112,7 +112,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
             <scope>test</scope>
         </dependency>
 -->
diff --git a/subdomains/freemarker/applib/pom.xml b/subdomains/freemarker/applib/pom.xml
index a58c59f..13e506a 100644
--- a/subdomains/freemarker/applib/pom.xml
+++ b/subdomains/freemarker/applib/pom.xml
@@ -31,7 +31,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/subdomains/ognl/applib/pom.xml b/subdomains/ognl/applib/pom.xml
index 94b27b0..c78194d 100644
--- a/subdomains/ognl/applib/pom.xml
+++ b/subdomains/ognl/applib/pom.xml
@@ -32,7 +32,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/subdomains/pdfbox/applib/pom.xml b/subdomains/pdfbox/applib/pom.xml
index de98a7b..6b984b7 100644
--- a/subdomains/pdfbox/applib/pom.xml
+++ b/subdomains/pdfbox/applib/pom.xml
@@ -32,7 +32,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/subdomains/spring/applib/pom.xml b/subdomains/spring/applib/pom.xml
index ee4d123..24f35de 100644
--- a/subdomains/spring/applib/pom.xml
+++ b/subdomains/spring/applib/pom.xml
@@ -32,7 +32,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index 8972b19..5799bbe 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -32,7 +32,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/subdomains/zip/applib/pom.xml b/subdomains/zip/applib/pom.xml
index 4db2045..f7e2753 100644
--- a/subdomains/zip/applib/pom.xml
+++ b/subdomains/zip/applib/pom.xml
@@ -32,7 +32,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/testing/fakedata/applib/pom.xml b/testing/fakedata/applib/pom.xml
index 6eac325..e111f53 100644
--- a/testing/fakedata/applib/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.javafaker</groupId>
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index 286261e..a1f9231 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 707cc99..efc73cf 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-applib</artifactId>
+            <artifactId>isis-applib</artifactId>
         </dependency>
 
         <dependency>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
index ff569c1..6610333 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -32,7 +32,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/valuetypes/markdown/applib/pom.xml b/valuetypes/markdown/applib/pom.xml
index 67ec557..1332a1f 100644
--- a/valuetypes/markdown/applib/pom.xml
+++ b/valuetypes/markdown/applib/pom.xml
@@ -32,7 +32,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
+			<artifactId>isis-applib</artifactId>
 		</dependency>
 
 		<dependency>


[isis] 11/21: ISIS-2259: renames isis-unittestsupport to isis-core-unittestsupport

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

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

commit ad03851391cb2d6c1ac04dc28d05ae5a1ac49c73
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:52:35 2020 +0000

    ISIS-2259: renames isis-unittestsupport to isis-core-unittestsupport
---
 api/applib/pom.xml                                   | 2 +-
 core/config/pom.xml                                  | 2 +-
 core/metamodel/pom.xml                               | 2 +-
 core/pom.xml                                         | 4 ++--
 core/runtime/pom.xml                                 | 2 +-
 core/runtimeservices/pom.xml                         | 2 +-
 core/testsupport/unittestsupport/pom.xml             | 2 +-
 core/viewers/restfulobjects/applib/pom.xml           | 2 +-
 core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 2 +-
 core/viewers/restfulobjects/rendering/pom.xml        | 2 +-
 core/viewers/restfulobjects/viewer/pom.xml           | 2 +-
 core/viewers/wicket/model/pom.xml                    | 2 +-
 core/viewers/wicket/ui/pom.xml                       | 2 +-
 core/viewers/wicket/viewer/pom.xml                   | 2 +-
 core/webapp/pom.xml                                  | 2 +-
 core/webboot-springboot/pom.xml                      | 2 +-
 extensions/security/shiro-realm-ldap/impl/pom.xml    | 2 +-
 legacy/extensions/core/applib/pom.xml                | 2 +-
 legacy/extensions/core/commons/pom.xml               | 2 +-
 legacy/extensions/core/metamodel/pom.xml             | 2 +-
 legacy/extensions/core/runtime/pom.xml               | 2 +-
 legacy/mappings/restclient/pom.xml                   | 2 +-
 legacy/testing/mavenplugin/pom.xml                   | 2 +-
 mavendeps/testing/pom.xml                            | 2 +-
 persistence/jdo/datanucleus-5/pom.xml                | 2 +-
 security/keycloak/pom.xml                            | 2 +-
 security/shiro/pom.xml                               | 2 +-
 subdomains/base/applib/pom.xml                       | 2 +-
 subdomains/excel/applib/pom.xml                      | 2 +-
 subdomains/excel/integtests/pom.xml                  | 2 +-
 subdomains/xdocreport/applib/pom.xml                 | 2 +-
 testing/fakedata/applib/pom.xml                      | 2 +-
 testing/fakedata/integtests/pom.xml                  | 2 +-
 testing/specsupport/applib/pom.xml                   | 2 +-
 testing/unittestsupport/applib/pom.xml               | 2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 9d1c6f4..66e1058 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -100,7 +100,7 @@
         <!-- TESTS -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/config/pom.xml b/core/config/pom.xml
index c0e9316..905ca19 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -83,7 +83,7 @@
         <!-- TESTS -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index aa2926d..deca218 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -112,7 +112,7 @@
 <!--
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 -->
diff --git a/core/pom.xml b/core/pom.xml
index 09b798c..d75ac69 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -694,12 +694,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-unittestsupport</artifactId>
+				<artifactId>isis-core-unittestsupport</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-unittestsupport</artifactId>
+				<artifactId>isis-core-unittestsupport</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>test-jar</type>
 				<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 7e4f6eb..823b1ec 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -69,7 +69,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index eb36738..eeecb1a 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index 21ff876..0b3a287 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -21,7 +21,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-unittestsupport</artifactId>
+	<artifactId>isis-core-unittestsupport</artifactId>
 	<name>Apache Isis Core - Unit Test Support</name>
 
 	<properties>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index 137d1f2..052d61c 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 4bedb31..6958bd5 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -95,7 +95,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/rendering/pom.xml
index c803a7a..3e9911d 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/rendering/pom.xml
@@ -49,7 +49,7 @@
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/core/viewers/restfulobjects/viewer/pom.xml
index 13a2bcf..6785000 100644
--- a/core/viewers/restfulobjects/viewer/pom.xml
+++ b/core/viewers/restfulobjects/viewer/pom.xml
@@ -72,7 +72,7 @@
         
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/viewers/wicket/model/pom.xml b/core/viewers/wicket/model/pom.xml
index 3f6c11c..d1d172e 100644
--- a/core/viewers/wicket/model/pom.xml
+++ b/core/viewers/wicket/model/pom.xml
@@ -70,7 +70,7 @@
 	<!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/viewers/wicket/ui/pom.xml b/core/viewers/wicket/ui/pom.xml
index beb277f..6f83290 100644
--- a/core/viewers/wicket/ui/pom.xml
+++ b/core/viewers/wicket/ui/pom.xml
@@ -320,7 +320,7 @@
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
 <!--
             <exclusions>
diff --git a/core/viewers/wicket/viewer/pom.xml b/core/viewers/wicket/viewer/pom.xml
index cd5f027..1ece1ea 100644
--- a/core/viewers/wicket/viewer/pom.xml
+++ b/core/viewers/wicket/viewer/pom.xml
@@ -158,7 +158,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index 04110e9..a7fff88 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -90,7 +90,7 @@
 
 		<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
             <exclusions>
             	<exclusion>
diff --git a/core/webboot-springboot/pom.xml b/core/webboot-springboot/pom.xml
index aee9ae3..f820000 100644
--- a/core/webboot-springboot/pom.xml
+++ b/core/webboot-springboot/pom.xml
@@ -71,7 +71,7 @@
         
 		<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index bd1c1fa..2057761 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index 2d1b4e3..6fd94e5 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -75,7 +75,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<!-- whatever unittestsupport is dependent on, it should not be transitive -->
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 67d516a..8a02ad9 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -75,7 +75,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<!-- whatever unittestsupport is dependent on, it should not be transitive -->
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 5eb718a..31ac042 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -87,7 +87,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<!-- whatever unittestsupport is dependent on, it should not be transitive -->
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index d61c256..14e5b0f 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -92,7 +92,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<!-- whatever unittestsupport is dependent on, it should not be transitive -->
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index acbbe46..e15a37e 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -54,7 +54,7 @@
 		<!-- TESTING -->
 		<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 		
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 029e5e7..7143446 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -42,7 +42,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 		</dependency>
 
 		<!-- JUPITER -->
diff --git a/mavendeps/testing/pom.xml b/mavendeps/testing/pom.xml
index 6c4ffba..f2b4362 100644
--- a/mavendeps/testing/pom.xml
+++ b/mavendeps/testing/pom.xml
@@ -33,7 +33,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<!--
             excluded to make consistent with JDK11 where these have been removed.
             -->
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index 1ec11b5..e303df8 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -139,7 +139,7 @@
 		
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index 0c52b6b..c48063f 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index a057591..25b3ab6 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/subdomains/base/applib/pom.xml b/subdomains/base/applib/pom.xml
index f267c40..f72f251 100644
--- a/subdomains/base/applib/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -37,7 +37,7 @@
         <!-- test -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 7e2a908..fcfa015 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -73,7 +73,7 @@
         <!-- test -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-             <artifactId>isis-unittestsupport</artifactId>
+             <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 060ff40..1622336 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -79,7 +79,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.isis.core</groupId>
-                    <artifactId>isis-unittestsupport</artifactId>
+                    <artifactId>isis-core-unittestsupport</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.junit.vintage</groupId>
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index 5799bbe..4b12354 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -59,7 +59,7 @@
 		<!-- test -->
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-unittestsupport</artifactId>
+			<artifactId>isis-core-unittestsupport</artifactId>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/testing/fakedata/applib/pom.xml b/testing/fakedata/applib/pom.xml
index e111f53..257c94f 100644
--- a/testing/fakedata/applib/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -59,7 +59,7 @@
         <!-- test -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index 53df511..d8ca296 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -75,7 +75,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.isis.core</groupId>
-                    <artifactId>isis-unittestsupport</artifactId>
+                    <artifactId>isis-core-unittestsupport</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.junit.vintage</groupId>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index a0a4582..df9e129 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -54,7 +54,7 @@
 		<!-- TESTING -->
 		<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
         </dependency>
                 
         <dependency>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index efc73cf..91a6301 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -31,7 +31,7 @@
         <!-- note that this is *not* a test dependency -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-unittestsupport</artifactId>
+            <artifactId>isis-core-unittestsupport</artifactId>
         </dependency>
     </dependencies>
 


[isis] 18/21: ISIS-2259: moves constants defined in ConfigurationConstants class elsewhere

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

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

commit 88b8e18325cc9adff5014e1c26be67c092fea5df
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:15:32 2020 +0000

    ISIS-2259: moves constants defined in ConfigurationConstants class elsewhere
---
 core/config/pom.xml                                |  4 +--
 .../isis/core/config/ConfigurationConstants.java   | 41 ----------------------
 .../apache/isis/core/config/IsisConfiguration.java |  5 +--
 ...ModuleConfig.java => IsisModuleCoreConfig.java} |  2 +-
 .../apache/isis/core/config/util/ConfigUtil.java   |  8 +++--
 .../apache/isis/metamodel/IsisModuleMetamodel.java |  4 +--
 .../identify/ObjectIdentifier_builtinHandlers.java |  4 +--
 .../ServiceInjectorDefaultTest_usingFields.java    |  4 +--
 ...InjectorDefaultTest_validateServices_happy.java |  4 +--
 .../services/ServiceInjectorLegacyTest.java        |  4 +--
 .../standard/AuthorizationConstants.java           |  4 +--
 .../isis/testdomain/config/IsisConfigBeanTest.java |  4 +--
 .../resources/MenuBarsResourceServerside.java      |  5 +--
 13 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/core/config/pom.xml b/core/config/pom.xml
index 905ca19..616853c 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -34,8 +34,8 @@
     </description>
 
     <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.config</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/config</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.core.config</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/core/config</git-plugin.propertiesDir>
     </properties>
 
     <build>
diff --git a/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
deleted file mode 100644
index 944e0c1..0000000
--- a/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.config;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.internal.collections._Lists;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public final class ConfigurationConstants {
-
-    public static final String LIST_SEPARATOR = ",";
-    public static final String DELIMITER = ".";
-    public static final String ROOT_PREFIX = "isis";
-    public static final String ROOT = ROOT_PREFIX + DELIMITER;
-
-    public static final List<String> PROTECTED_KEYS =
-            _Lists.of("password", "apiKey", "authToken");
-
-    // -- SERVICE SUPPORT
-    public static final String SERVICE_IDENTIFIER = "1";
-}
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 10878ee..14bd2b8 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -67,11 +67,12 @@ import lombok.Data;
  * 
  * @since 2.0
  */
-@ConfigurationProperties(ConfigurationConstants.ROOT_PREFIX)
+@ConfigurationProperties(IsisConfiguration.ROOT_PREFIX)
 @Data
 @Validated
 public class IsisConfiguration {
 
+    public static final String ROOT_PREFIX = "isis";
     @Autowired private ConfigurableEnvironment environment;
     
     @Inject @Named("isis-settings") private Map<String, String> isisSettings;
@@ -1147,7 +1148,7 @@ public class IsisConfiguration {
         private static Map<Pattern, String> toPatternMap(String cssClassPatterns) {
             final Map<Pattern,String> valueByPattern = _Maps.newLinkedHashMap();
             if(cssClassPatterns != null) {
-                final StringTokenizer regexToCssClasses = new StringTokenizer(cssClassPatterns, ConfigurationConstants.LIST_SEPARATOR);
+                final StringTokenizer regexToCssClasses = new StringTokenizer(cssClassPatterns, ",");
                 final Map<String,String> valueByRegex = _Maps.newLinkedHashMap();
                 while (regexToCssClasses.hasMoreTokens()) {
                     String regexToCssClass = regexToCssClasses.nextToken().trim();
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
index 4db74c4..5e38e4a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
@@ -51,7 +51,7 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
         IsisConfiguration.class,
         RestEasyConfiguration.class,
 })
-public class IsisModuleConfig {
+public class IsisModuleCoreConfig {
     
     @ConfigurationProperties(prefix = "isis")
     @Bean("isis-settings")
diff --git a/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
index 5c1b146..cfe57ed 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
@@ -18,17 +18,21 @@
  */
 package org.apache.isis.core.config.util;
 
+import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.config.ConfigurationConstants;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class ConfigUtil {
 
+    public static final List<String> PROTECTED_KEYS =
+            _Lists.of("password", "apiKey", "authToken");
+
     public static Map<String, String> maskIfProtected(
             final Map<String, String> inMap,
             final Supplier<Map<String, String>> mapFactory) {
@@ -50,7 +54,7 @@ public class ConfigUtil {
             return false;
         }
         final String toLowerCase = key.toLowerCase();
-        for (String protectedKey : ConfigurationConstants.PROTECTED_KEYS) {
+        for (String protectedKey : PROTECTED_KEYS) {
             if(toLowerCase.contains(protectedKey.toLowerCase())) {
                 return true;
             }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
index dd7d186..c3514be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.metamodel.context.MetaModelContexts;
 import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
 import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
@@ -56,7 +56,7 @@ import org.apache.isis.security.api.IsisModuleSecurityApi;
 @Import({
         // modules
         IsisModuleApplib.class,
-        IsisModuleConfig.class,
+        IsisModuleCoreConfig.class,
         IsisModuleSecurityApi.class,
 
         // @Configuration's
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index c04e28b..daf1962 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.objectmanager.identify;
 import java.util.UUID;
 
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.config.ConfigurationConstants;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
@@ -34,6 +33,7 @@ import lombok.val;
 
 class ObjectIdentifier_builtinHandlers {
 
+    public static final String SERVICE_IDENTIFIER = "1";
 
     static class GuardAgainstRootOid implements Handler {
 
@@ -60,7 +60,7 @@ class ObjectIdentifier_builtinHandlers {
 
         @Override
         public RootOid handle(ManagedObject managedObject) {
-            final String identifier = ConfigurationConstants.SERVICE_IDENTIFIER;
+            final String identifier = SERVICE_IDENTIFIER;
             return Oid.Factory.persistentOf(managedObject.getSpecification().getSpecId(), identifier);
         }
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 752d23f..4aa0f3a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 
@@ -46,7 +46,7 @@ import lombok.Getter;
 @ActiveProfiles("test")
 @SpringBootTest(classes = {
         IsisBeanFactoryPostProcessorForSpring.class,
-        IsisModuleConfig.class,
+        IsisModuleCoreConfig.class,
         ServiceInjectorDefault.class,
         ServiceRegistryDefault.class,
         ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index 845814c..a580c84 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -34,13 +34,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 
 @ActiveProfiles("test")
 @SpringBootTest(classes = {
-        IsisModuleConfig.class,
+        IsisModuleCoreConfig.class,
         ServiceInjectorDefault.class,
         ServiceRegistryDefault.class,
         ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index a07d795..504f74d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
@@ -50,7 +50,7 @@ import lombok.val;
 @ActiveProfiles("test")
 @SpringBootTest(classes = {
         IsisBeanFactoryPostProcessorForSpring.class,
-        IsisModuleConfig.class,
+        IsisModuleCoreConfig.class,
         ServiceInjectorLegacy.class,
         ServiceRegistryDefault.class,
         ServiceInjectorLegacyTest.Producers.class,
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
index 4a1ffe6..be462ac 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
@@ -19,11 +19,9 @@
 
 package org.apache.isis.security.api.authorization.standard;
 
-import org.apache.isis.core.config.ConfigurationConstants;
-
 public final class AuthorizationConstants {
 
-    private static final String ROOT = ConfigurationConstants.ROOT + "authorization.";
+    private static final String ROOT = "isis.authorization.";
 
     public static final String LEARN = ROOT + "learn";
     public static final boolean LEARN_DEFAULT = false;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 6a04d22..bcb9b39 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -28,14 +28,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 
 @Smoketest
 @SpringBootTest(
         classes = { 
-                IsisModuleConfig.class
+                IsisModuleCoreConfig.class
         }
         )
 @TestPropertySource({
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 0dad7fb..e02e89c 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -31,7 +31,6 @@ import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
 import org.apache.isis.applib.layout.links.Link;
 import org.apache.isis.applib.layout.menubars.MenuBars;
 import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.core.config.ConfigurationConstants;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -46,6 +45,8 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.Seri
 @Component
 public class MenuBarsResourceServerside extends ResourceAbstract implements MenuBarsResource {
 
+    public static final String SERVICE_IDENTIFIER = "1";
+
     @Inject
     public MenuBarsResourceServerside(
             final MetaModelContext metaModelContext,
@@ -86,7 +87,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
                 final String objectType = actionLayoutData.getObjectType();
                 final String relativeUrl = String.format(
                         "objects/%s/%s/actions/%s",
-                        objectType, ConfigurationConstants.SERVICE_IDENTIFIER, actionLayoutData.getId());
+                        objectType, SERVICE_IDENTIFIER, actionLayoutData.getId());
                 Link link = new Link(
                         Rel.ACTION.getName(),
                         HttpMethod.GET,


[isis] 17/21: ISIS-2259: fixes package names for isis-core-config

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

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

commit b6d4fa12aa681fb40068459822cf9215dd7b10cd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:11:03 2020 +0000

    ISIS-2259: fixes package names for isis-core-config
---
 .../bytebuddy/IsisModuleCoreCodegenByteBuddy.java  |  6 +++---
 .../isis/core/commons/IsisModuleCoreCommons.java   |  2 +-
 .../{ => core}/config/ConfigurationConstants.java  |  2 +-
 .../isis/{ => core}/config/IsisConfiguration.java  | 24 +++++++++++-----------
 .../isis/{ => core}/config/IsisModuleConfig.java   | 14 ++++++-------
 .../{ => core}/config/RestEasyConfiguration.java   |  2 +-
 .../IsisBeanFactoryPostProcessorForSpring.java     |  2 +-
 .../config/beans/IsisBeanTypeRegistry.java         |  2 +-
 .../config/beans/IsisBeanTypeRegistryHolder.java   |  2 +-
 .../config/beans/IsisComponentScanInterceptor.java |  2 +-
 .../isis/{ => core}/config/beans/TypeMetaData.java |  2 +-
 .../config/messages/MessageRegistry.java           |  2 +-
 .../facets/AuditObjectsConfiguration.java          |  4 ++--
 .../facets/CommandActionsConfiguration.java        |  4 ++--
 .../facets/CommandPropertiesConfiguration.java     |  2 +-
 .../metamodel/facets/DefaultViewConfiguration.java |  4 ++--
 .../facets/EditingObjectsConfiguration.java        |  2 +-
 .../facets/PublishActionsConfiguration.java        |  4 ++--
 .../facets/PublishObjectsConfiguration.java        |  4 ++--
 .../facets/PublishPropertiesConfiguration.java     |  2 +-
 .../{ => core}/config/metamodel/facets/Util.java   |  2 +-
 .../ApplicationFeaturesInitConfiguration.java      |  2 +-
 .../metamodel/specloader/IntrospectionMode.java    |  4 ++--
 .../presets/DataNucleusAutoCreate.properties       |  0
 .../config/presets/DebugDiscovery.properties       |  0
 .../config/presets/DebugMetaModel.properties       |  0
 .../config/presets/DebugPersistence.properties     |  0
 .../presets/DebugProgrammingModel.properties       |  0
 .../config/presets/H2InMemory.properties           |  0
 .../presets/H2InMemory_withUniqueSchema.properties |  0
 .../config/presets/HsqlDbInMemory.properties       |  0
 .../config/presets/IsisIntegTest.properties        |  0
 .../{ => core}/config/presets/IsisPresets.java     |  2 +-
 .../config/presets/NoTranslations.properties       |  0
 .../config/presets/SilenceMetaModel.properties     |  0
 .../presets/SilenceProgrammingModel.properties     |  0
 .../config/presets/SilenceWicket.properties        |  0
 .../config/presets/UseLog4j2Test.properties        |  0
 .../isis/{ => core}/config/util/ConfigUtil.java    |  4 ++--
 .../PatternOptionalStringConstraintValidator.java  |  2 +-
 .../config/viewer/wicket/DialogMode.java           |  2 +-
 .../config/viewer/wicket/WebAppConfiguration.java  |  4 ++--
 .../config/viewer/wicket/WebAppContextPath.java    |  2 +-
 .../services/javax.validation.ConstraintValidator  |  2 +-
 .../config/IsisConfiguration_createSubsetTest.java |  2 +-
 ...ion_getMaxTitleLengthInParentedTables_Test.java |  2 +-
 ...n_getMaxTitleLengthInStandaloneTables_Test.java |  2 +-
 .../config/IsisConfiguration_primingTest.java      |  2 +-
 .../config/IsisConfiguration_specialCharTest.java  |  2 +-
 .../config/IsisConfiguration_whitespaceTest.java   |  2 +-
 .../config/util/ConfigUtil_isProtected_Test.java   |  2 +-
 .../config/util/ConfigUtil_mask_Test.java          |  2 +-
 .../WebAppContextPath_setContextPath_Test.java     |  2 +-
 .../apache/isis/metamodel/IsisModuleMetamodel.java |  2 +-
 .../isis/metamodel/context/MetaModelContext.java   |  2 +-
 .../context/MetaModelContext_usingIoc.java         |  2 +-
 .../command/CommandFacetForActionAnnotation.java   |  4 ++--
 .../PublishedActionFacetForActionAnnotation.java   |  4 ++--
 .../PromptStyleFacetForActionLayoutAnnotation.java |  2 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |  2 +-
 .../facets/fallback/FallbackFacetFactory.java      |  2 +-
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |  2 +-
 .../object/defaults/DefaultsProviderUtil.java      |  2 +-
 .../annotcfg/DefaultedFacetAnnotation.java         |  2 +-
 .../AuditableFacetForDomainObjectAnnotation.java   |  4 ++--
 .../ImmutableFacetForDomainObjectAnnotation.java   |  4 ++--
 ...lishedObjectFacetForDomainObjectAnnotation.java |  4 ++--
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  2 +-
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |  2 +-
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  2 +-
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |  2 +-
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |  2 +-
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |  2 +-
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  2 +-
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |  2 +-
 .../recreatable/RecreatableObjectFacetFactory.java |  3 ++-
 .../value/annotcfg/ValueFacetAnnotation.java       |  2 +-
 .../ValueSemanticsProviderAndFacetAbstract.java    |  2 +-
 .../value/vsp/ValueSemanticsProviderUtil.java      |  2 +-
 .../command/CommandFacetForPropertyAnnotation.java |  4 ++--
 ...ublishedPropertyFacetForPropertyAnnotation.java |  4 ++--
 ...romptStyleFacetForPropertyLayoutAnnotation.java |  2 +-
 .../DateAndTimeValueSemanticsProviderAbstract.java |  2 +-
 .../ValueSemanticsProviderAbstractTemporal.java    |  2 +-
 .../BigDecimalValueSemanticsProvider.java          |  2 +-
 .../BigIntegerValueSemanticsProvider.java          |  2 +-
 .../bytes/ByteValueSemanticsProviderAbstract.java  |  2 +-
 .../date/DateValueSemanticsProviderAbstract.java   |  2 +-
 .../Jdk8LocalDateValueSemanticsProvider.java       |  2 +-
 .../JodaLocalDateValueSemanticsProvider.java       |  2 +-
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |  2 +-
 ...fsetDateTimeValueSemanticsProviderAbstract.java |  2 +-
 ...JodaDateTimeValueSemanticsProviderAbstract.java |  2 +-
 .../JodaLocalDateTimeValueSemanticsProvider.java   |  2 +-
 .../DoubleValueSemanticsProviderAbstract.java      |  2 +-
 .../FloatValueSemanticsProviderAbstract.java       |  2 +-
 .../integer/IntValueSemanticsProviderAbstract.java |  2 +-
 .../longs/LongValueSemanticsProviderAbstract.java  |  2 +-
 .../ShortValueSemanticsProviderAbstract.java       |  2 +-
 .../time/TimeValueSemanticsProviderAbstract.java   |  2 +-
 .../TimeStampValueSemanticsProviderAbstract.java   |  2 +-
 .../identify/ObjectIdentifier_builtinHandlers.java |  2 +-
 .../ProgrammingModelInitFilterDefault.java         |  2 +-
 .../metamodel/services/ServiceInjectorLegacy.java  |  2 +-
 .../ApplicationFeatureRepositoryDefault.java       |  4 ++--
 .../services/registry/ServiceRegistryDefault.java  |  2 +-
 .../title/TitlesAndTranslationsValidator.java      |  2 +-
 .../specloader/SpecificationLoaderDefault.java     |  8 ++++----
 .../specimpl/ObjectSpecificationAbstract.java      |  4 ++--
 .../validator/MetaModelValidatorAbstract.java      |  2 +-
 .../metamodel/MetaModelContext_forTesting.java     |  6 +++---
 .../action/ActionAnnotationFacetFactoryTest.java   |  4 ++--
 .../ActionAnnotationFacetFactoryTest_Command.java  |  2 +-
 ...ctionAnnotationFacetFactoryTest_Publishing.java |  2 +-
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  2 +-
 .../DomainObjectAnnotationFacetFactoryTest.java    |  6 +++---
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  2 +-
 .../ServiceInjectorDefaultTest_usingFields.java    |  4 ++--
 ...InjectorDefaultTest_validateServices_happy.java |  4 ++--
 .../services/ServiceInjectorLegacyTest.java        |  6 +++---
 .../SpecificationLoaderTestAbstract.java           |  2 +-
 .../runtime/context/session/RuntimeContext.java    |  2 +-
 .../context/session/RuntimeContextBase.java        |  2 +-
 .../runtime/session/IsisSessionFactoryDefault.java |  2 +-
 .../session/init/IsisLocaleInitializer.java        |  2 +-
 .../session/init/IsisTimeZoneInitializer.java      |  2 +-
 .../runtimeservices/IsisModuleRuntimeServices.java |  4 ++--
 .../confmenu/ConfigurationViewServiceDefault.java  |  6 +++---
 .../runtimeservices/email/EmailServiceDefault.java |  2 +-
 .../homepage/HomePageResolverServiceDefault.java   |  2 +-
 .../i18n/po/TranslationServicePo.java              |  2 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |  2 +-
 .../repository/RepositoryServiceDefault.java       |  2 +-
 .../standard/AuthorizationConstants.java           |  2 +-
 .../webapp/context/IsisWebAppCommonContext.java    |  2 +-
 .../isis/webapp/modules/WebModuleContext.java      |  2 +-
 .../templresources/TemplateResourceServlet.java    |  4 ++--
 .../webappctx/IsisWebAppContextInitializer.java    |  4 ++--
 .../demo/src/main/java/demoapp/webapp/DemoApp.java |  2 +-
 .../testdomain/conf/Configuration_headless.java    |  2 +-
 .../testdomain/conf/Configuration_usingJdo.java    |  2 +-
 .../conf/Configuration_usingJdoAndShiro.java       |  2 +-
 .../isis/testdomain/rest/RestEndpointService.java  |  4 ++--
 .../testdomain/auditing/AuditerServiceTest.java    |  2 +-
 .../bootstrapping/AutoConfigurationTest.java       |  6 +++---
 .../bootstrapping/JdoBootstrappingTest.java        |  2 +-
 .../JdoBootstrappingTest_usingFixtures.java        |  2 +-
 .../SpringServiceInjectOrderTest.java              |  2 +-
 .../SpringServiceProvisioningTest.java             |  2 +-
 .../commandexecution/WrapperAsyncTest.java         |  2 +-
 .../commandexecution/WrapperSyncTest.java          |  2 +-
 .../org/apache/isis/testdomain/config/FooTest.java |  2 +-
 .../isis/testdomain/config/IsisConfigBeanTest.java |  6 +++---
 .../config/IsisConfigBeanTest_usingHeadless.java   |  4 ++--
 .../domainmodel/AnnotationSyntesizerTest.java      |  2 +-
 .../DomainModelTest_usingBadDomain.java            |  6 +++---
 ...nModelTest_usingBadDomain_noActionEnforced.java |  6 +++---
 .../DomainModelTest_usingGoodDomain.java           |  2 +-
 .../domainmodel/SpecloaderPerformanceTest.java     |  4 ++--
 .../testdomain/ldap/LdapEmbeddedServerTest.java    |  2 +-
 .../isis/testdomain/logging/LoggerSetupTest.java   |  2 +-
 .../publishing/PublisherServiceTest.java           |  2 +-
 .../isis/testdomain/rest/RestServiceTest.java      |  2 +-
 .../isis/testdomain/shiro/ShiroLdapTest.java       |  2 +-
 .../shiro/ShiroSecmanLdap_restfulStressTest.java   |  2 +-
 .../isis/testdomain/shiro/ShiroSecmanTest.java     |  2 +-
 .../transactions/TransactionRollbackTest.java      |  2 +-
 ...TransactionRollbackTest_usingTransactional.java |  2 +-
 .../isis/legacy/applib/DomainObjectContainer.java  |  2 +-
 .../PercentageValueSemanticsProvider.java          |  2 +-
 .../service/JdoPersistenceLifecycleService.java    |  2 +-
 .../entities/JdoEntityTypeRegistry.java            |  2 +-
 ...eptionRecognizerCompositeForJdoObjectStore.java |  2 +-
 .../metamodel/JdoProgrammingModelPlugin.java       |  2 +-
 .../DataNucleusApplicationComponents5.java         |  2 +-
 .../persistence/IsisPersistenceSessionJdoBase.java |  2 +-
 .../persistence/PersistenceSessionFactory5.java    |  4 ++--
 ...onRecognizerCompositeForJdoObjectStoreTest.java |  2 +-
 .../shiro/authentication/AuthenticatorShiro.java   |  2 +-
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  2 +-
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  2 +-
 .../h2console/ui/webmodule/WebModuleH2Console.java |  2 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java  |  2 +-
 .../sse/ui/markup/ListeningMarkupComponent.java    |  2 +-
 .../markup/ListeningMarkupComponent_observing.java |  2 +-
 .../webmodule/WebModuleJaxrsResteasy4.java         |  2 +-
 .../restfulobjects/rendering/IResourceContext.java |  2 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  2 +-
 .../service/swagger/SwaggerServiceDefault.java     |  2 +-
 .../service/swagger/SwaggerServiceMenu.java        |  2 +-
 .../resources/DomainObjectResourceServerside.java  |  2 +-
 .../resources/DomainServiceResourceServerside.java |  2 +-
 .../resources/DomainTypeResourceServerside.java    |  2 +-
 .../resources/HomePageResourceServerside.java      |  2 +-
 .../viewer/resources/ImageResourceServerside.java  |  2 +-
 .../resources/MenuBarsResourceServerside.java      |  4 ++--
 .../viewer/resources/ResourceAbstract.java         |  2 +-
 .../viewer/resources/UserResourceServerside.java   |  2 +-
 .../resources/VersionResourceServerside.java       |  2 +-
 .../wicket/model/isis/WicketViewerSettings.java    |  2 +-
 .../serviceactions/ServiceActionUtil.java          |  2 +-
 .../wicket/ui/components/footer/FooterPanel.java   |  4 ++--
 .../wicket/ui/components/welcome/WelcomePanel.java |  2 +-
 .../ui/components/widgets/favicon/Favicon.java     |  2 +-
 .../ui/components/widgets/navbar/BrandLogo.java    |  2 +-
 .../ui/components/widgets/navbar/BrandName.java    |  2 +-
 .../themepicker/IsisWicketThemeSupport.java        |  2 +-
 .../themepicker/IsisWicketThemeSupportDefault.java |  2 +-
 .../widgets/themepicker/ThemeChooser.java          |  2 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  2 +-
 .../isis/viewer/wicket/ui/pages/WebPageBase.java   |  2 +-
 .../accmngt/signup/RegistrationFormPanel.java      |  2 +-
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  2 +-
 .../isis/viewer/wicket/ui/panels/PanelUtil.java    |  2 +-
 .../services/WicketViewerSettingsDefault.java      |  2 +-
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  2 +-
 .../viewer/wicketapp/IsisWicketApplication.java    |  2 +-
 217 files changed, 271 insertions(+), 270 deletions(-)

diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
index 7e81aa1..639d85e 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
@@ -4,15 +4,15 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.core.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCoreCommons;
 
 @Configuration
 @Import({
         // modules
-        IsisModuleCommons.class,
+        IsisModuleCoreCommons.class,
         
         // services
         ProxyFactoryServiceByteBuddy.class
 })
-public class IsisModuleCodegenByteBuddy {
+public class IsisModuleCoreCodegenByteBuddy {
 }
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
index b6f8268..34b7747 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
@@ -10,5 +10,5 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
     // @Service's
     IsisSystemEnvironment.class
 })
-public class IsisModuleCommons {
+public class IsisModuleCoreCommons {
 }
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
rename to core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
index a8911ae..944e0c1 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import java.util.List;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 9fca5a7..10878ee 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,17 +45,17 @@ import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
-import org.apache.isis.config.metamodel.facets.DefaultViewConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
-import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.viewer.wicket.DialogMode;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.viewer.wicket.DialogMode;
 
 import lombok.Data;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
similarity index 82%
rename from core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
index d379ce4..4db74c4 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,16 +27,16 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.core.commons.IsisModuleCommons;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.config.validators.PatternOptionalStringConstraintValidator;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.commons.IsisModuleCoreCommons;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.validators.PatternOptionalStringConstraintValidator;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 
 @Configuration
 @Import({
     // modules
-    IsisModuleCommons.class,
+    IsisModuleCoreCommons.class,
 
     // @Component's
     IsisConfiguration.PatternsConverter.class,
diff --git a/core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
index 4a3a3e3..dd90ee2 100644
--- a/core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index b8eb257..f2542df 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
 
 import javax.inject.Named;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
similarity index 99%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
index 3aa745a..6d1c0e8 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
similarity index 71%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
index e00f3a3..7a65713 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
 
 public interface IsisBeanTypeRegistryHolder {
 
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
index c292caa..c09ff0a 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
 
 import org.springframework.stereotype.Component;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java b/core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
index ba171f6..3043a46 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
 
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.context._Context;
diff --git a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java b/core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
rename to core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
index 8f0b282..3e9a8c3 100644
--- a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.config.messages;
+package org.apache.isis.core.config.messages;
 
 import java.util.List;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
similarity index 90%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
index 46d5fff..89529c9 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public enum AuditObjectsConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
index a46be00..1af183a 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public enum CommandActionsConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
index fac8729..580bbd1 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
 public enum CommandPropertiesConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
index f921ca0..4f36acd 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public enum DefaultViewConfiguration {
     HIDDEN(),
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
index 8fc740c..3e7f6cd 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
 public enum EditingObjectsConfiguration {
     TRUE,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
index 227cd36..0ce00c0 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public enum PublishActionsConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
similarity index 90%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
index 370d623..7a454ce 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public enum PublishObjectsConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
index 94ac649..adf757f 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
 public enum PublishPropertiesConfiguration {
     ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
index b758caa..2ed3c79 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
 
 public final class Util {
 
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
similarity index 72%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
index fb09d92..e5012f5 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.metamodel.services;
+package org.apache.isis.core.config.metamodel.services;
 
 public enum ApplicationFeaturesInitConfiguration {
     EAGER,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
index 6253934..295e33a 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
@@ -16,11 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.metamodel.specloader;
+package org.apache.isis.core.config.metamodel.specloader;
 
 import org.apache.isis.core.commons.internal.environment.DeploymentType;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.val;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugPersistence.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugPersistence.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/HsqlDbInMemory.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/HsqlDbInMemory.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisIntegTest.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/IsisIntegTest.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
rename to core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
index b008a6f..0221a90 100644
--- a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.presets;
+package org.apache.isis.core.config.presets;
 
 /**
  * Supports Spring's {@code @PropertySource} annotation.
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/NoTranslations.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/NoTranslations.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceWicket.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceWicket.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/UseLog4j2Test.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/UseLog4j2Test.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
rename to core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
index cadfcb9..5c1b146 100644
--- a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java b/core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
rename to core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
index d918440..14b53a9 100644
--- a/core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.validators;
+package org.apache.isis.core.config.validators;
 
 import java.util.Optional;
 import java.util.regex.Pattern;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
index cb32dc1..b5768ad 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
 
 public enum DialogMode {
 
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
index 2e5c04b..c082502 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -31,7 +31,7 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.Getter;
 import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
index ac9625d..6130055 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
 
 import java.io.Serializable;
 import java.util.regex.Matcher;
diff --git a/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator b/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
index 6c0435a..a1f44ff 100644
--- a/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
+++ b/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
@@ -1 +1 @@
-org.apache.isis.config.validators.PatternOptionalStringConstraintValidator
\ No newline at end of file
+org.apache.isis.core.config.validators.PatternOptionalStringConstraintValidator
\ No newline at end of file
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
index d715cb5..f5620df 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
index f66076b..049f7a1 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index 9992490..6434437 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
index a8dec28..93828cb 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
index 9e81dcb..5eb81ed 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
index 3b5078a..9ce8be5 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config;
+package org.apache.isis.core.config;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
index bfb5874..bc86672 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
 
 import org.junit.Test;
 
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
index 106eb96..62b4cbe 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
 
 import org.junit.Test;
 
diff --git a/core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java b/core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
index 9ec66da..18646a7 100644
--- a/core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
index 42a9bbf..dd7d186 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleConfig;
 import org.apache.isis.metamodel.context.MetaModelContexts;
 import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
 import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
index 03c3268..c47a118 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.services.homepage.HomePageAction;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
index d00dd34..0322eff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.commons.internal.ioc.IocContainer;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.services.ServiceUtil;
 import org.apache.isis.metamodel.services.homepage.HomePageAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index 65cd948..2272039 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -26,8 +26,8 @@ import org.apache.isis.applib.annotation.CommandPersistence;
 import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index af04ddc..c2367a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
 import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index 68b049a..c12ebdd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index 5a5d020..a0fb3d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -23,7 +23,7 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
index 284f75e..f7eca14 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
index 45ee5f6..5b9bad9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.MethodUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
index 419b689..1aca443 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.defaults;
 
 import org.apache.isis.applib.adapters.DefaultsProvider;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
index 847a43c..41df36f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
 
 import org.apache.isis.applib.annotation.Defaulted;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetAbstract;
 import org.apache.isis.metamodel.facets.object.defaults.DefaultsProviderUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index c917222..cbdd630 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Auditing;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
 import org.apache.isis.metamodel.facets.object.audit.AuditableFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index a0eb9fc..5463cfd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -25,8 +25,8 @@ import java.util.Optional;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index ef70659..d2ac7a6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.domainobject.publishing;
 import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet;
 import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index b973974..ece4a84 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index c3bcf28..0c4745f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 1854a705..0dee92a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.icon.IconFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index 0f0fe83..ada2285 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.icon.IconFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 1da5668..d426030 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.LayoutUiEvent;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
index db30a2b..1788335 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.LayoutUiEvent;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index e500f85..b047de1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.title.TitleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index f995a58..229407d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.title.TitleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 3652f5d..e4437d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import org.apache.isis.applib.RecreatableDomainObject;
 import org.apache.isis.applib.ViewModel;
 import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
@@ -49,7 +50,7 @@ implements MetaModelRefiner, PostConstructMethodCache {
     }
 
     /**
-     * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, org.apache.isis.config.IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
+     * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
      * been attached.
      */
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
index 54f939e..a56683e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.value.annotcfg;
 
 import org.apache.isis.applib.annotation.Value;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.ValueFacetAbstract;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index 3e0f78b..bb1c0f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.commons.LocaleUtil;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index b14d26c..50e670d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.value.vsp;
 
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index db730cb..bef3cf1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -26,8 +26,8 @@ import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandPropertiesConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
index 1dfa513..9f75a35 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishPropertiesConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet;
 import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index 40bb342..16beda4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index ca53ba0..be89177 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.TimeZone;
 
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
 public abstract class DateAndTimeValueSemanticsProviderAbstract<T> 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 0218d32..e5d465c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -33,7 +33,7 @@ import java.util.TimeZone;
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index 2e6e038..e381bbb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -28,7 +28,7 @@ import java.util.Map;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
index 73b1f4a..a724474 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
index b047013..a6a29cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index 609c0c0..462ca9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index fee9048..8767291 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index abccad3..ce3b184 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index 958c22b..4191719 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
index 636597c..40fa00f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index bf2b0ec..09865b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index fdd6d5e..8af73ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
index d886281..7bae659 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
index ceaffa6..5918e69 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
index 70e191f..24833f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
index cf00b92..325cd0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
index 993d1eb..6a2e5d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
index fbbd4e7..31777aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
index 6684242..92034ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index 5f8a4f9..c04e28b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.objectmanager.identify;
 import java.util.UUID;
 
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 3988c68..a73b362 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -27,7 +27,7 @@ import javax.inject.Named;
 
 import org.springframework.stereotype.Component;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index 7d57380..f9ab967 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.collections._Arrays;
 import org.apache.isis.core.commons.internal.collections._Collections;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.commons.ToString;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 75369bd..faacdbb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.SingleIntValueFacet;
 import org.apache.isis.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
index a537b5f..1a95bb9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 import org.apache.isis.core.commons.internal.ioc.spring._Spring;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
index 526f1f9..ab6d899 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -22,7 +22,7 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.core.commons.internal.base._Blackhole;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
 import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index e6f63e9..631798a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -43,10 +43,10 @@ import org.apache.isis.core.commons.internal.base._Timing;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 5051560..af1d268 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.commons.internal.collections._Streams;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.commons.internal.ioc.BeanSort;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 import org.apache.isis.metamodel.commons.ClassExtensions;
 import org.apache.isis.metamodel.commons.ToString;
 import org.apache.isis.metamodel.consent.Consent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
index 4605212..70049af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.specloader.validator;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index 5cb3ed2..83b1f03 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -36,9 +36,9 @@ import org.apache.isis.applib.services.xactn.TransactionState;
 import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index cd79747..7ae1746 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -28,8 +28,8 @@ import org.junit.After;
 import org.junit.Before;
 
 import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
 import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 1691dd0..c7bb835 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.CommandExecuteIn;
 import org.apache.isis.applib.annotation.CommandPersistence;
 import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index d0326c9..efc22b6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.core.commons.internal.base._Blackhole;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 1621d1d..d69dd9c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.RecreatableDomainObject;
 import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.context.MetaModelContextAware;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 7f2af35..268e63f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertThat;
 import org.apache.isis.applib.annotation.Bounding;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
 import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index ce4553e..efb6d8e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
 
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 655f58d..752d23f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -37,8 +37,8 @@ import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 
 import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index da60f06..845814c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -34,8 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 
 @ActiveProfiles("test")
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index ca8c03e..a07d795 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -37,9 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
 import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
 import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 3e71eef..f606f14 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.i18n.TranslationService.Mode;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
index 16ff51f..b37812b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
@@ -20,7 +20,7 @@ package org.apache.isis.runtime.context.session;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.services.homepage.HomePageAction;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
index 1bdf2bc..5064e39 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.services.homepage.HomePageAction;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
index 56d331b..10b14a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.commons.internal.collections._Sets;
 import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
 import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
 import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.session.RuntimeEventService;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
index 6697fcd..310de6b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.session.init;
 import java.util.Locale;
 import java.util.Optional;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
index f50c3e2..6d18158 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtime.session.init;
 
 import java.util.TimeZone;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index fc848ad..9aa1f11 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtimeservices;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.core.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
 import org.apache.isis.runtime.IsisModuleRuntime;
 import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
 import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
@@ -54,7 +54,7 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
 @Import({
         // modules
         IsisModuleRuntime.class,
-        IsisModuleCodegenByteBuddy.class,
+        IsisModuleCoreCodegenByteBuddy.class,
 
         // @Service's
         AuthenticationSessionProviderDefault.class,
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index f2386c1..8b89cd6 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -40,9 +40,9 @@ import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.util.ConfigUtil;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.util.ConfigUtil;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
index df5bb0a..98a1a04 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
index 5e875f2..483456c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.facets.actions.homepage.HomePageFacet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
index 20eeacc..51b0301 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 @Service
 @Named("isisRuntimeServices.TranslationServicePo")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 284fffd..bdd7262 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index a7eb6e8..8e250b7 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.core.commons.internal.base._NullSafe;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.runtime.persistence.session.PersistenceSession;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
index 48b4fb0..4a1ffe6 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.security.api.authorization.standard;
 
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
 
 public final class AuthorizationConstants {
 
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
index 294b1ac..787b53e 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
@@ -27,7 +27,7 @@ import org.springframework.transaction.support.TransactionTemplate;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.menu.MenuBarsService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index c7155e2..327032a 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
index 23f597b..b90d097 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.isis.core.commons.internal.base._Bytes;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 import org.apache.isis.metamodel.commons.InputStreamExtensions;
 import org.apache.isis.metamodel.commons.ResourceUtil;
 import org.apache.isis.metamodel.commons.StringExtensions;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
index e5003d5..7d85cc7 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
@@ -30,8 +30,8 @@ import org.springframework.boot.web.servlet.ServletContextInitializer;
 
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 import org.apache.isis.webapp.modules.WebModule;
 import org.apache.isis.webapp.modules.WebModuleContext;
 
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index af7e674..61160a8 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 7fa0c77..11d1cb0 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.applib.services.xactn.TransactionId;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index c48e23a..81a0773 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 06945fb..075336e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
index a54ccf5..5fb1a5e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
@@ -26,8 +26,8 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.client.SuppressionType;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 import org.apache.isis.extensions.restclient.ResponseDigest;
 import org.apache.isis.extensions.restclient.RestfulClient;
 import org.apache.isis.extensions.restclient.RestfulClientConfig;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index 031fb02..8fac8c2 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index 3d025ff..907063e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.metamodel.context.MetaModelContexts;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingStereotypes;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index f926438..f21d6bc 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
 import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 022f513..e949e11 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 6ba2113..9cf143c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.runtimeservices.message.MessageServiceDefault;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 83bc7f8..712be75 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
 import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
 
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index d2fa7c6..bff9772 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -41,7 +41,7 @@ import org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase;
 import org.apache.isis.applib.services.factory.FactoryService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
index f30125b..4d119ac 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.apache.isis.applib.services.factory.FactoryService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
index 878c933..82519b3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 
 @Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index b9ac34e..6a04d22 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -27,9 +27,9 @@ import org.springframework.test.context.TestPropertySource;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 
 @Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 277438e..dc06be7 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -27,8 +27,8 @@ import org.springframework.test.context.TestPropertySource;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_headless;
 
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 0fdcdcd..8ace5da 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
 import org.apache.isis.core.commons.internal.reflection._Annotations;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.schema.metamodel.v1.DomainClassDto;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 9fac106..9c9965c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -29,9 +29,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
 import org.apache.isis.metamodel.spec.DomainModelException;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index 18e135f..7c4ebd3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -29,9 +29,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
 import org.apache.isis.metamodel.spec.DomainModelException;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index ca76cec..9a2e069 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 3143c3c..617a19d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -29,8 +29,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.isis.core.commons.internal.base._Timing;
 import org.apache.isis.core.commons.internal.reflection._Annotations;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 4ad18f5..80846d9 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.TestPropertySource;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Smoketest;
 
 import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index 706ea46..0cdfbe6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 
 import lombok.val;
 
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 8e0ce0d..8b241a1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index dbc5791..47eb998 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
 import org.apache.isis.testdomain.jdo.Book;
 import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 208faaa..3da2329 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.Incubating;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index e413b27..066083e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTimeout;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index bc03993..d84f701 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
 import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 46a17b9..9ebdb61 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 0599580..f75a6f1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
index 2ad9529..b32a27c 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.legacy.applib.filter.Filter;
 import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
 
diff --git a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index c6d90aa..4df4a55 100644
--- a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -25,7 +25,7 @@ import java.text.ParseException;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
 import org.apache.isis.legacy.applib.value.Percentage;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 2543ddd..7ce6d86 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.core.commons.internal.context._Context;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.runtime.context.session.AppLifecycleEvent;
 import org.apache.isis.runtime.context.session.SessionLifecycleEvent;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
index 5bb5a36..455523e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 import javax.jdo.annotations.PersistenceCapable;
 
 import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
 import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
 
 import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
index 0af2f24..a5ba53c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 /**
  * Convenience implementation of the {@link ExceptionRecognizer} domain service that
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
index 8bc9c02..6b75e90 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.collections._Multimaps;
 import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.ignore.datanucleus.RemoveDatanucleusPersistableTypesFacetFactory;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index c5b7e64..e08d666 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -38,7 +38,7 @@ import org.datanucleus.store.schema.SchemaAwareStoreManager;
 import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusLifeCycleHelper;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 3b124c0..fd23c23 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.commons.ToString;
 import org.apache.isis.metamodel.context.MetaModelContext;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index b18defd..2dd7a88 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.core.commons.internal.base._Blackhole;
 import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledState;
 import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 09f5e7f..8376728 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.unittestsupport.config.internal._Config;
 
 import lombok.val;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 213de43..0ee2b3f 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.core.commons.internal.collections._Sets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.security.api.authentication.AuthenticationRequest;
 import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
 import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index c8972fd..827a62e 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -35,7 +35,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.security.api.authentication.AuthenticationRequest;
 import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
 import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index d093a82..96f01f9 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.security.api.authentication.AuthenticationRequest;
 import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
 import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 03af628..206c37d 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.value.LocalResourcePath;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.webapp.modules.WebModuleAbstract;
 import org.apache.isis.webapp.modules.WebModuleContext;
 
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index f06bd0d..b359be9 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.RestrictTo;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 @DomainService(
         nature = NatureOfService.VIEW,
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
index 3565e12..b8c68b0 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.model.IModel;
 
 import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
 
 import lombok.val;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
index 2642b64..36d42c4 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
@@ -24,7 +24,7 @@ import java.util.UUID;
 
 import org.apache.isis.applib.value.LocalResourcePath;
 import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 
 import static org.apache.isis.core.commons.internal.base._Strings.isNullOrEmpty;
 
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 559dd09..63913b1 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
 import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
 import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
 import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index 181b1df..09f0827 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -24,7 +24,7 @@ import javax.ws.rs.core.MediaType;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 70fa281..991fc8a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.domain.DomainObjectList;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 64fd9f3..4ae749a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
 import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator;
 
 @Service
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
index 8362547..fa90a48 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.swagger.SwaggerService;
 import org.apache.isis.applib.value.Clob;
 import org.apache.isis.applib.value.LocalResourcePath;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
 
 
 @Named("isisApplib.SwaggerServiceMenu")
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index cb4f8b1..5ae5f0b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.commons.internal.base._Bytes;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.resources._Resources;
 import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.consent.Consent;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.context.MetaModelContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 2cb1fc7..8994d5a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index 18e3e43..7868ed5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.facets.object.grid.GridFacet;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index afe69a4..8039d46 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 93f268b..31488a9 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 
 import org.apache.isis.core.commons.internal.base._Bytes;
 import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 
 @Component
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 4a08a9f..0dad7fb 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
 import org.apache.isis.applib.layout.links.Link;
 import org.apache.isis.applib.layout.menubars.MenuBars;
 import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.ConfigurationConstants;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.viewer.restfulobjects.applib.Rel;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 64cdaab..344d1c5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index 375b553..6dc3c3b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index ae2e9cf..54d6662 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
index 3f6191a..57d6b27 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.isis;
 import java.io.Serializable;
 
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 public interface WicketViewerSettings extends Serializable {
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index e1b4898..42719e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index f85b3c5..2f36ffe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -34,8 +34,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.core.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration.Viewer.Wicket.Credit;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket.Credit;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
 import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
 import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index c31baa5..ae4a15d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
 
 import org.apache.wicket.markup.html.basic.Label;
 
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
 import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index 34da2c0..512b9ff 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.util.string.Strings;
 
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 
 /**
  * A component for application favorite icon
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 5e7518b..8450d45 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebComponent;
 
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 
 /**
  * A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 377c1b1..e8fb4f0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.Model;
 
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 
 /**
  * A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
index 96b8051..8e6442a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.themepicker;
 import java.util.List;
 
 import org.apache.isis.core.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.val;
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index 5295f02..cdcf541 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.commons.internal.base._NullSafe;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index e54dba3..6d94010 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -31,7 +31,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.cookies.CookieUtils;
 import org.apache.wicket.util.string.Strings;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 
 import lombok.Getter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 3dbc6aa..704e881 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -62,7 +62,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
 import org.apache.isis.core.commons.internal.ioc.BeanSort;
-import org.apache.isis.config.viewer.wicket.DialogMode;
+import org.apache.isis.core.config.viewer.wicket.DialogMode;
 import org.apache.isis.security.api.authentication.AuthenticationSession;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
 import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index cd7479c..d11baac 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
 import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index bfe3c69..e6702fc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -34,7 +34,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
 
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
 import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 8678e98..6183904 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel;
 import org.apache.isis.applib.services.i18n.LocaleProvider;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.security.api.authentication.MessageBroker;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
index 8fa617c..8e164bd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
index 9f6811f..8666f60 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
 
 import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 2b209f9..8c8432a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.webapp.modules.WebModuleAbstract;
 import org.apache.isis.webapp.modules.WebModuleContext;
 
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index ed4b3d6..a1e8de3 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -67,7 +67,7 @@ import org.wicketstuff.select2.ApplicationSettings;
 import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
 import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
 import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;


[isis] 09/21: ISIS-2259: renames isis-integtestsupport to isis-testing-integtestsupport-applib

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

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

commit aa0d039d124b33657f7822a70a3f415672aea98f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:45:36 2020 +0000

    ISIS-2259: renames isis-integtestsupport to isis-testing-integtestsupport-applib
---
 antora/playbooks/site-testing.yml | 6 +++---
 antora/playbooks/site.yml         | 6 +++---
 core/pom.xml                      | 5 -----
 mavendeps/testing/pom.xml         | 2 +-
 testing/fixtures/applib/pom.xml   | 2 +-
 testing/integtestsupport/pom.xml  | 4 ++--
 testing/pom.xml                   | 6 ++++++
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 58015c9..d2e258a 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -19,9 +19,6 @@ content:
     - url: .
       start_path: core/testsupport/unittestsupport/src/main/doc # testing
       branches: HEAD
-    - url: .
-      start_path: core/testsupport/integtestsupport/src/main/doc # testing
-      branches: HEAD
 
 # testing
     - url: .
@@ -37,6 +34,9 @@ content:
       start_path: testing/hsqldbmgr/impl/src/main/doc # testing
       branches: HEAD
     - url: .
+      start_path: testing/integtestsupport/src/main/doc # testing
+      branches: HEAD
+    - url: .
       start_path: testing/specsupport/src/main/doc # testing
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 15d28b5..82d0865 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -100,9 +100,6 @@ content:
       start_path: core/testsupport/unittestsupport/src/main/doc # testing
       branches: HEAD
     - url: .
-      start_path: core/testsupport/integtestsupport/src/main/doc # testing
-      branches: HEAD
-    - url: .
       start_path: core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc # vro
       branches: HEAD
     - url: .
@@ -234,6 +231,9 @@ content:
       start_path: testing/hsqldbmgr/src/main/doc # testing
       branches: HEAD
     - url: .
+      start_path: testing/integtestsupport/src/main/doc # testing
+      branches: HEAD
+    - url: .
       start_path: testing/specsupport/src/main/doc # testing
       branches: HEAD
     - url: .
diff --git a/core/pom.xml b/core/pom.xml
index 8910151..750a0de 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -810,11 +810,6 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-integtestsupport</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
 				<artifactId>isis-viewer-restfulobjects-applib</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
diff --git a/mavendeps/testing/pom.xml b/mavendeps/testing/pom.xml
index dec2934..6c4ffba 100644
--- a/mavendeps/testing/pom.xml
+++ b/mavendeps/testing/pom.xml
@@ -58,7 +58,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-integtestsupport</artifactId>
+			<artifactId>isis-testing-integtestsupport-applib</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index aaaef79..5db80c0 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -76,7 +76,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-integtestsupport</artifactId>
+			<artifactId>isis-testing-integtestsupport-applib</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index b72a8a3..a54f2a9 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -21,8 +21,8 @@
 		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-integtestsupport</artifactId>
-	<name>Apache Isis Core - Integ Test Support</name>
+	<artifactId>isis-testing-integtestsupport-applib</artifactId>
+	<name>Apache Isis Testing - Integ Test Support</name>
 
 	<properties>
 		<jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
diff --git a/testing/pom.xml b/testing/pom.xml
index eab6c4e..446c902 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -62,6 +62,12 @@
 		<dependencies>
 
 			<dependency>
+				<groupId>org.apache.isis.core</groupId>
+				<artifactId>isis-testing-integtestsupport-applib</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
 				<groupId>org.apache.isis.subdomains</groupId>
 				<artifactId>isis-subdomains-spring-applib</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>