You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/01/09 06:59:30 UTC

[isis] 01/01: Merge branch 'dev/2.0.0-M1'

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

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

commit 186e5b91edcecb6787d96ec85db0b6844e273324
Merge: 66e719e e97fa3c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 9 06:49:46 2018 +0000

    Merge branch 'dev/2.0.0-M1'

 .../main/asciidoc/guides/rgant/_rgant-Action.adoc  |   7 +-
 .../guides/rgant/_rgant-Action_publishing.adoc     |  19 +-
 .../guides/rgant/_rgant-CollectionLayout.adoc      |   7 -
 .../rgant/_rgant-CollectionLayout_defaultView.adoc |   5 -
 .../rgant/_rgant-CollectionLayout_render.adoc      |  43 --
 .../guides/rgant/_rgant-Collection_typeOf.adoc     |   2 +-
 .../asciidoc/guides/rgant/_rgant-DomainObject.adoc |  10 +-
 .../guides/rgant/_rgant-DomainObjectLayout.adoc    |   2 +-
 .../_rgant-DomainObjectLayout_describedAs.adoc     |   2 +-
 .../_rgant-DomainObjectLayout_titleUiEvent.adoc    |   2 +-
 .../guides/rgant/_rgant-DomainObject_auditing.adoc |   3 +-
 ..._rgant-DomainObject_autoCompleteRepository.adoc |   4 +-
 .../_rgant-DomainObject_createdLifecycleEvent.adoc |   4 +-
 .../rgant/_rgant-DomainObject_objectType.adoc      |   2 +-
 .../rgant/_rgant-DomainObject_publishing.adoc      |  21 +-
 .../guides/rgant/_rgant-DomainServiceLayout.adoc   |   2 +-
 .../asciidoc/guides/rgant/_rgant-MinLength.adoc    |   4 +-
 .../asciidoc/guides/rgant/_rgant-Parameter.adoc    |   6 -
 .../guides/rgant/_rgant-ParameterLayout.adoc       |   2 +-
 .../rgant/_rgant-ParameterLayout_describedAs.adoc  |   6 +-
 .../guides/rgant/_rgant-ParameterLayout_named.adoc |   3 +-
 .../main/asciidoc/guides/rgant/_rgant-Pattern.adoc |  53 ++
 .../asciidoc/guides/rgant/_rgant-Programmatic.adoc |   2 +-
 .../asciidoc/guides/rgant/_rgant-Property.adoc     |   1 -
 .../rgant/_rgant-PropertyLayout_describedAs.adoc   |   2 +-
 .../guides/rgant/_rgant-Property_publishing.adoc   |   5 +-
 .../main/asciidoc/guides/rgant/_rgant-Title.adoc   |   9 +-
 .../guides/rgant/_rgant-ViewModelLayout.adoc       |   2 +-
 .../guides/rgant/_rgant-ViewModel_objectType.adoc  |   2 +-
 .../src/main/asciidoc/guides/rgant/_rgant_aaa.adoc |   1 -
 .../guides/rgant/_rgant_aaa_deprecated.adoc        | 353 ---------
 .../main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc |   7 +
 .../asciidoc/guides/rgant/_rgant_aaa_partial.adoc  |  26 -
 .../src/main/asciidoc/guides/rgant/rgant.adoc      |   5 +-
 .../guides/rgcfg/_rgcfg_configuring-core.adoc      |   5 +-
 .../guides/rgcms/_rgcms_schema-common.adoc         |   5 +-
 .../main/asciidoc/guides/rgcms/_rgcms_schema.adoc  |   4 -
 .../guides/rgfis/_rgfis_application-layer.adoc     |   2 +-
 ...pplication-layer_CommandDtoServiceInternal.adoc |  21 +-
 .../guides/rgfis/_rgfis_persistence-layer.adoc     |   5 +-
 ..._persistence-layer_AuditingServiceInternal.adoc |  22 +-
 ...stence-layer_ChangedObjectsServiceInternal.adoc |   2 +-
 ...ce-layer_PersistenceSessionServiceInternal.adoc |   2 +-
 ...ersistence-layer_PublishingServiceInternal.adoc |  22 +-
 ...lication-layer-api_ActionInvocationContext.adoc |   2 +
 ...vc_application-layer-api_BackgroundService.adoc |   2 +
 ...plication-layer-api_BulkInteractionContext.adoc |   9 -
 ...rgsvc_application-layer-api_CommandContext.adoc |   8 +-
 ...c_application-layer-api_InteractionContext.adoc |  11 +-
 ...rgsvc_application-layer-api_MessageService.adoc |   6 +-
 ...ication-layer-api_SessionManagementService.adoc |   1 +
 .../_rgsvc_application-layer-api_TitleService.adoc |   7 +-
 ...c_application-layer-api_TransactionService.adoc |   5 -
 ...rgsvc_application-layer-api_WrapperFactory.adoc |  31 +-
 ...ication-layer-spi_BackgroundCommandService.adoc |  32 +-
 ...rgsvc_application-layer-spi_CommandService.adoc |  34 +-
 ...lication-layer-spi_HomePageProviderService.adoc |   1 -
 ...vc_bootstrapping-spi_ClassDiscoveryService.adoc |   8 +-
 .../guides/rgsvc/_rgsvc_core-domain-api.adoc       |  34 -
 .../rgsvc/_rgsvc_core-domain-api_ClockService.adoc |   1 -
 ...rgsvc_core-domain-api_ConfigurationService.adoc |   4 -
 ...gsvc_core-domain-api_DomainObjectContainer.adoc |   8 -
 ...mainObjectContainer_generic-repository-api.adoc |  84 ---
 ...ain-api_DomainObjectContainer_messages-api.adoc |  45 --
 ..._DomainObjectContainer_object-creation-api.adoc |  34 +-
 ...mainObjectContainer_object-persistence-api.adoc |  40 +-
 ...api_DomainObjectContainer_presentation-api.adoc |  47 --
 ...n-api_DomainObjectContainer_properties-api.adoc |  50 --
 ...ain-api_DomainObjectContainer_security-api.adoc |  47 --
 ...ain-api_DomainObjectContainer_services-api.adoc |  36 -
 .../_rgsvc_core-domain-api_EventBusService.adoc    |   5 +-
 .../_rgsvc_core-domain-api_FactoryService.adoc     |  16 +-
 .../rgsvc/_rgsvc_core-domain-api_Scratchpad.adoc   |   1 +
 .../rgsvc/_rgsvc_core-domain-api_UserService.adoc  |   6 -
 .../guides/rgsvc/_rgsvc_integration-api.adoc       |   2 +-
 .../_rgsvc_integration-api_BookmarkService.adoc    |  10 +-
 .../rgsvc/_rgsvc_integration-api_JaxbService.adoc  |   5 +-
 .../_rgsvc_integration-api_MementoService.adoc     |   2 +
 .../_rgsvc_integration-api_XmlSnapshotService.adoc |   3 +-
 .../main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc   |  11 +-
 .../rgsvc/_rgsvc_metadata-api_LayoutService.adoc   |   7 +-
 .../_rgsvc_metadata-api_MetamodelService.adoc      |   2 -
 .../rgsvc/_rgsvc_metadata-api_ServiceRegistry.adoc |  12 +-
 .../rgsvc/_rgsvc_metadata-api_SwaggerService.adoc  |   6 +-
 ...rgsvc_persistence-layer-api_IsisJdoSupport.adoc |   2 +-
 ...rgsvc_persistence-layer-api_MetricsService.adoc |   3 +-
 ...vc_persistence-layer-api_QueryResultsCache.adoc |   4 +
 ...vc_persistence-layer-api_RepositoryService.adoc |   7 +-
 .../guides/rgsvc/_rgsvc_persistence-layer-spi.adoc |  34 +-
 ...rgsvc_persistence-layer-spi_AuditerService.adoc |  11 +-
 ...svc_persistence-layer-spi_PublisherService.adoc |  29 +-
 ...sistence-layer-spi_UserRegistrationService.adoc |   2 -
 ...presentation-layer-api_AcceptHeaderService.adoc |   5 +-
 ...svc_presentation-layer-api_DeepLinkService.adoc |   1 -
 ...c_presentation-layer-api_GuiceBeanProvider.adoc |   5 +-
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc       |   2 +-
 ...ntation-layer-spi_EmailNotificationService.adoc |   5 +-
 ...esentation-layer-spi_ErrorReportingService.adoc |   2 -
 ...presentation-layer-spi_ExceptionRecognizer.adoc |  11 +-
 .../_rgsvc_presentation-layer-spi_HintStore.adoc   |   1 +
 ...gsvc_presentation-layer-spi_RoutingService.adoc |   8 +-
 ...entation-layer-spi_TableColumnOrderService.adoc |   5 +
 ..._presentation-layer-spi_TranslationService.adoc |   4 +-
 ..._presentation-layer-spi_UrlEncodingService.adoc |   4 +-
 .../ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc  |  13 +-
 .../_ugbtb_hints-and-tips_persisted-title.adoc     |  10 +-
 .../guides/ugbtb/_ugbtb_programming-model.adoc     |   1 -
 .../ugbtb/_ugbtb_programming-model_finetuning.adoc |   6 +-
 ...b_programming-model_layout-metadata-reader.adoc |  88 ---
 ...ailable-domain-services_framework-provided.adoc |   3 -
 .../_ugfun_building-blocks_identifiers_oid.adoc    |   2 +-
 .../_ugfun_core-concepts_apache-isis-vs_cqrs.adoc  |   2 +-
 ...ore-concepts_apache-isis-vs_event-sourcing.adoc |   2 +-
 .../_ugfun_core-concepts_deployment-options.adoc   |   2 +-
 .../ugfun/_ugfun_programming-model_actions.adoc    |   4 +-
 ...amming-model_domain-services_contributions.adoc |   2 +-
 .../ugfun/_ugfun_programming-model_mixins.adoc     |   2 +-
 ...amming-model_mixins_contributed-collection.adoc |   2 +-
 ...fun_programming-model_mixins_inferred-name.adoc |   2 +-
 ...programming-model_properties-vs-parameters.adoc |   2 +-
 ...amming-model_view-models_dto_dto-consumers.adoc |   2 +-
 .../ugfun/_ugfun_ui-hints_eager-rendering.adoc     |   4 -
 ...-mappings_mandatory-properties-in-subtypes.adoc |   4 -
 .../src/main/asciidoc/guides/ugsec/ugsec.adoc      |   2 +-
 .../_ugtst_integ-test-support_typical-usage.adoc   |   4 +-
 .../_ugvw_customisation_tweaking-css-classes.adoc  |   3 +-
 .../_ugvw_extending_replacing-page-elements.adoc   |   3 +-
 .../guides/ugvw/_ugvw_layout_file-based.adoc       |  10 +-
 .../_migration-notes_1.16.0-to-2.0.0.adoc          | 223 ++++++
 ...on-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc |   3 +-
 .../pages/common-use-cases/common-use-cases.adoc   |   2 +-
 .../src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc |  20 +-
 .../tg/_tg_stop-scaffolding-start-coding.adoc      | 126 +++-
 .../release-notes/_release-notes_2.0.0.adoc        |   9 +
 core/applib/pom.xml                                |   2 +-
 .../isis/applib/AbstractContainedObject.java       | 808 ---------------------
 .../apache/isis/applib/AbstractDomainObject.java   | 144 ----
 .../isis/applib/AbstractFactoryAndRepository.java  |  47 --
 .../org/apache/isis/applib/AbstractService.java    |   2 +-
 .../org/apache/isis/applib/AbstractViewModel.java  |   2 +-
 .../java/org/apache/isis/applib/AppManifest.java   |   2 +-
 .../apache/isis/applib/DomainObjectContainer.java  | 471 +-----------
 .../org/apache/isis/applib/IsisApplibModule.java   |  52 --
 .../isis/applib/RecreatableDomainObject.java       |   5 -
 .../org/apache/isis/applib/adapters/Parser.java    |   2 -
 .../applib/adapters/ValueSemanticsProvider.java    |   2 -
 .../org/apache/isis/applib/annotation/Action.java  |  23 +-
 .../isis/applib/annotation/ActionInteraction.java  |  42 --
 .../isis/applib/annotation/ActionLayout.java       |  11 +-
 .../apache/isis/applib/annotation/ActionOrder.java |  42 --
 .../isis/applib/annotation/ActionSemantics.java    | 141 ----
 .../apache/isis/applib/annotation/Aggregated.java  |  36 -
 .../apache/isis/applib/annotation/Auditing.java    |   7 +-
 .../isis/applib/annotation/AutoComplete.java       |  70 --
 .../isis/applib/annotation/BookmarkPolicy.java     |   7 +-
 .../isis/applib/annotation/Bookmarkable.java       |  47 --
 .../org/apache/isis/applib/annotation/Bounded.java |  36 -
 .../package-info.java => annotation/Bounding.java} |   9 +-
 .../org/apache/isis/applib/annotation/Bulk.java    | 277 -------
 .../apache/isis/applib/annotation/Collection.java  |  13 +-
 .../applib/annotation/CollectionInteraction.java   |  42 --
 .../isis/applib/annotation/CollectionLayout.java   |  24 +-
 .../org/apache/isis/applib/annotation/Command.java | 103 ---
 .../isis/applib/annotation/CommandExecuteIn.java   |  18 -
 .../isis/applib/annotation/CommandPersistence.java |  18 -
 .../isis/applib/annotation/CommandReification.java |   7 +-
 .../apache/isis/applib/annotation/Contributed.java |   8 +-
 .../apache/isis/applib/annotation/CssClass.java    |  43 --
 .../apache/isis/applib/annotation/CssClassFa.java  |  53 --
 .../org/apache/isis/applib/annotation/Debug.java   |  38 -
 .../apache/isis/applib/annotation/DescribedAs.java |  45 --
 .../apache/isis/applib/annotation/Disabled.java    |  54 --
 .../isis/applib/annotation/DomainObject.java       |  32 +-
 .../isis/applib/annotation/DomainObjectLayout.java |   4 +-
 .../isis/applib/annotation/DomainService.java      |   2 +-
 .../applib/annotation/DomainServiceLayout.java     |   7 +-
 .../org/apache/isis/applib/annotation/Editing.java |  12 +-
 .../isis/applib/annotation/EqualByContent.java     |   6 +-
 .../apache/isis/applib/annotation/Exploration.java |  38 -
 .../apache/isis/applib/annotation/FieldOrder.java  |  37 -
 .../org/apache/isis/applib/annotation/Hidden.java  |  50 --
 .../apache/isis/applib/annotation/Idempotent.java  |  36 -
 .../org/apache/isis/applib/annotation/Ignore.java  |  37 -
 .../apache/isis/applib/annotation/Immutable.java   |  43 --
 .../apache/isis/applib/annotation/InvokeOn.java    |  26 +-
 .../apache/isis/applib/annotation/InvokedOn.java   |  24 -
 .../isis/applib/annotation/LabelPosition.java      |   7 +-
 .../apache/isis/applib/annotation/Mandatory.java   |  57 --
 .../org/apache/isis/applib/annotation/Mask.java    | 205 ------
 .../apache/isis/applib/annotation/MaxLength.java   |  42 --
 .../isis/applib/annotation/MemberGroupLayout.java  |   9 +-
 .../isis/applib/annotation/MemberGroups.java       |  43 --
 .../{Auditing.java => MementoSerialization.java}   |  24 +-
 .../apache/isis/applib/annotation/MultiLine.java   |  40 -
 .../apache/isis/applib/annotation/MustSatisfy.java |  49 --
 .../org/apache/isis/applib/annotation/Named.java   |  42 --
 .../isis/applib/annotation/NatureOfService.java    |  13 +-
 .../isis/applib/annotation/NotContributed.java     |  85 ---
 .../isis/applib/annotation/NotInServiceMenu.java   |  46 --
 .../isis/applib/annotation/NotPersistable.java     |  66 --
 .../isis/applib/annotation/NotPersisted.java       |  39 -
 .../apache/isis/applib/annotation/ObjectType.java  |  41 --
 .../apache/isis/applib/annotation/Optional.java    |  50 --
 .../apache/isis/applib/annotation/Optionality.java |   7 +-
 .../org/apache/isis/applib/annotation/Paged.java   |  42 --
 .../apache/isis/applib/annotation/Parameter.java   |  23 +-
 .../isis/applib/annotation/ParameterLayout.java    |  10 +-
 .../applib/annotation/PostsActionInvokedEvent.java |  44 --
 .../annotation/PostsCollectionAddedToEvent.java    |  41 --
 .../PostsCollectionRemovedFromEvent.java           |  43 --
 .../annotation/PostsPropertyChangedEvent.java      |  43 --
 .../apache/isis/applib/annotation/PromptStyle.java |   7 +-
 .../apache/isis/applib/annotation/Property.java    |  20 +-
 .../applib/annotation/PropertyInteraction.java     |  42 --
 .../isis/applib/annotation/PropertyLayout.java     |  17 +-
 .../apache/isis/applib/annotation/Prototype.java   |  36 -
 .../isis/applib/annotation/PublishedAction.java    |  59 --
 .../isis/applib/annotation/PublishedObject.java    |  79 --
 .../apache/isis/applib/annotation/Publishing.java  |   7 +-
 .../applib/annotation/PublishingChangeKind.java    |  19 -
 .../PublishingPayloadFactoryForAction.java         |  75 --
 .../PublishingPayloadFactoryForObject.java         |  73 --
 .../apache/isis/applib/annotation/QueryOnly.java   |  36 -
 .../org/apache/isis/applib/annotation/RegEx.java   |  55 --
 .../org/apache/isis/applib/annotation/Render.java  |  59 --
 .../annotation/{Plural.java => RenderDay.java}     |  30 +-
 .../apache/isis/applib/annotation/RenderType.java  |  51 --
 .../applib/annotation/RenderedAsDayBefore.java     |  36 -
 .../annotation/{Audited.java => Repainting.java}   |  31 +-
 .../org/apache/isis/applib/annotation/Resolve.java |  70 --
 .../apache/isis/applib/annotation/RestrictTo.java  |   3 +-
 .../apache/isis/applib/annotation/SemanticsOf.java |  32 +-
 .../apache/isis/applib/annotation/SortedBy.java    |  44 --
 .../org/apache/isis/applib/annotation/TypeOf.java  |  42 --
 .../isis/applib/annotation/TypicalLength.java      |  39 -
 .../apache/isis/applib/annotation/ViewModel.java   |   2 +-
 .../isis/applib/annotation/ViewModelLayout.java    |   4 +-
 .../org/apache/isis/applib/annotation/When.java    | 110 ---
 .../java/org/apache/isis/applib/clock/Clock.java   |  27 -
 .../java/org/apache/isis/applib/filter/Filter.java |  51 --
 .../org/apache/isis/applib/filter/Filters.java     | 106 ---
 .../apache/isis/applib/filter/package-info.java    |  31 -
 .../apache/isis/applib/fixtures/BaseFixture.java   |   3 +-
 .../fixturescripts/BuilderScriptAbstract.java      |   2 +-
 .../isis/applib/fixturescripts/FixtureScript.java  | 120 +--
 .../isis/applib/fixturescripts/FixtureScripts.java | 134 +---
 .../applib/fixturescripts/PersonaWithFinder.java   |   4 +-
 .../events}/FixturesInstalledEvent.java            |   2 +-
 .../events}/FixturesInstallingEvent.java           |   2 +-
 .../layout/component/PropertyLayoutData.java       |  44 +-
 .../apache/isis/applib/marker/AlwaysImmutable.java |  31 -
 .../org/apache/isis/applib/marker/Auditable.java   |  40 -
 .../org/apache/isis/applib/marker/Bounded.java     |  29 -
 .../isis/applib/marker/ImmutableOncePersisted.java |  34 -
 .../applib/marker/ImmutableUntilPersisted.java     |  35 -
 .../apache/isis/applib/marker/NeverImmutable.java  |  35 -
 .../apache/isis/applib/marker/NonPersistable.java  |  30 -
 .../isis/applib/marker/ProgramPersistable.java     |  30 -
 .../apache/isis/applib/marker/package-info.java    |  28 -
 .../isis/applib/query/QueryBuiltInAbstract.java    |  58 --
 .../isis/applib/query/QueryFindAllInstances.java   |   2 +-
 .../apache/isis/applib/security/RoleMemento.java   |   2 -
 .../apache/isis/applib/security/UserMemento.java   |   2 -
 .../services/actinvoc/ActionInvocationContext.java |  30 +-
 .../applib/services/audit/AuditingService3.java    |  55 --
 .../background/ActionInvocationMemento.java        | 145 ----
 .../background/BackgroundCommandService.java       |  18 +-
 .../background/BackgroundCommandService2.java      |  13 +-
 .../services/background/BackgroundService.java     |  10 -
 .../isis/applib/services/bookmark/Bookmark.java    |   4 +
 .../applib/services/bookmark/BookmarkService.java  |  38 +-
 .../applib/services/bookmark/BookmarkService2.java |  65 --
 .../applib/services/bookmark/package-info.java     |   2 +-
 .../classdiscovery/ClassDiscoveryService.java      |   7 +-
 .../classdiscovery/ClassDiscoveryService2.java     |  39 -
 .../ClassDiscoveryServiceUsingReflections.java     |  14 +-
 .../services/classdiscovery/package-info.java      |   2 +-
 .../isis/applib/services/command/Command.java      |  59 +-
 .../isis/applib/services/command/Command2.java     |  63 --
 .../isis/applib/services/command/Command3.java     |  58 --
 .../applib/services/command/CommandDefault.java    |  64 +-
 .../services/command/spi/CommandService.java       |  13 +-
 .../conmap/ContentMappingService.java              |   2 +-
 .../applib/{ => services}/conmap/package-info.java |   4 +-
 .../services/eventbus/AbstractDomainEvent.java     |   7 +-
 .../eventbus/AbstractInteractionEvent.java         | 113 ---
 .../services/eventbus/ActionDomainEvent.java       |  73 +-
 .../services/eventbus/ActionInteractionEvent.java  |  77 --
 .../services/eventbus/ActionInvokedEvent.java      |  55 --
 .../services/eventbus/CollectionAddedToEvent.java  |  45 --
 .../services/eventbus/CollectionDomainEvent.java   |  56 +-
 .../eventbus/CollectionInteractionEvent.java       |  70 --
 .../eventbus/CollectionRemovedFromEvent.java       |  46 --
 .../services/eventbus/PropertyChangedEvent.java    |  56 --
 .../services/eventbus/PropertyDomainEvent.java     |  37 +-
 .../eventbus/PropertyInteractionEvent.java         |  62 --
 .../services/exceprecog/ExceptionRecognizer.java   |  59 ++
 .../services/exceprecog/ExceptionRecognizer2.java  |  86 ---
 .../exceprecog/ExceptionRecognizerAbstract.java    |   4 +-
 .../exceprecog/ExceptionRecognizerComposite.java   |  29 +-
 ...eptionRecognizerCompositeForJdoObjectStore.java |   2 +-
 ...xceptionRecognizerForJDODataStoreException.java |   2 +-
 ...traintViolationForeignKeyNoActionException.java |   2 +-
 ...ionRecognizerForJDOObjectNotFoundException.java |   2 +-
 ...yConstraintViolationUniqueOrIndexException.java |   2 +-
 .../fixturespec/FixtureScriptsDefault.java         |  10 +-
 .../fixturespec/FixtureScriptsSpecification.java   |   2 +-
 .../homepage/AbstractHomePageDashboardService.java |  97 ---
 .../services/jaxb/JaxbServiceDefault.java          |  10 +-
 .../applib/services/layout/Object_openRestApi.java |   6 +-
 .../services/metamodel/MetaModelService.java       |  89 ++-
 .../services/metamodel/MetaModelService2.java      |  82 ---
 .../services/metamodel/MetaModelService3.java      |  46 --
 .../services/metamodel/MetaModelService4.java      |  39 -
 .../applib/services/metamodel/package-info.java    |   2 +-
 .../applib/services/publish/EventMetadata.java     | 257 -------
 .../isis/applib/services/publish/EventPayload.java |  40 -
 .../publish/EventPayloadForActionInvocation.java   | 218 ------
 .../publish/EventPayloadForObjectChanged.java      |  70 --
 .../applib/services/publish/EventSerializer.java   |  62 --
 .../isis/applib/services/publish/EventType.java    |  41 --
 .../applib/services/publish/ObjectStringifier.java |  32 -
 .../applib/services/publish/PublishingService.java |  87 ---
 .../queryresultscache/QueryResultsCache.java       |   4 +-
 .../applib/services/registry/ServiceRegistry.java  |   4 +
 .../applib/services/registry/ServiceRegistry2.java |  30 -
 .../applib/services/registry/package-info.java     |   2 +-
 .../services/session/SessionLoggingService.java    |   6 +-
 .../applib/services/settings/SettingTypes.java     |  70 --
 .../UrlEncodingServiceUsingBaseEncoding.java       |  10 +-
 ...aseEncodingWithSupportForLargeUrlsAbstract.java |  69 ++
 .../UrlEncodingServiceWithCompressionAbstract.java |  66 ++
 .../applib/services/wrapper/DisabledException.java |   4 +-
 .../applib/services/wrapper/HiddenException.java   |   4 +-
 .../services/wrapper/InteractionException.java     |   2 +-
 .../applib/services/wrapper/InvalidException.java  |   4 +-
 .../applib/services/wrapper/WrapperFactory.java    |   3 +-
 .../applib/services/wrapper/WrapperObject.java     |  61 --
 .../{ => services/wrapper}/events/AccessEvent.java |   4 +-
 .../wrapper}/events/ActionArgumentEvent.java       |   4 +-
 .../wrapper}/events/ActionInvocationEvent.java     |   5 +-
 .../wrapper}/events/ActionUsabilityEvent.java      |   4 +-
 .../wrapper}/events/ActionVisibilityEvent.java     |   4 +-
 .../wrapper}/events/CollectionAccessEvent.java     |   4 +-
 .../wrapper}/events/CollectionAddToEvent.java      |   4 +-
 .../wrapper}/events/CollectionMethodEvent.java     |   4 +-
 .../wrapper}/events/CollectionRemoveFromEvent.java |   4 +-
 .../wrapper}/events/CollectionUsabilityEvent.java  |   4 +-
 .../wrapper}/events/CollectionVisibilityEvent.java |   4 +-
 .../wrapper}/events/InteractionEvent.java          |   4 +-
 .../wrapper}/events/ObjectTitleEvent.java          |   4 +-
 .../wrapper}/events/ObjectValidityEvent.java       |   4 +-
 .../wrapper}/events/ObjectVisibilityEvent.java     |   4 +-
 .../wrapper}/events/ParseValueEvent.java           |   4 +-
 .../wrapper}/events/PropertyAccessEvent.java       |   4 +-
 .../wrapper}/events/PropertyModifyEvent.java       |   4 +-
 .../wrapper}/events/PropertyUsabilityEvent.java    |   4 +-
 .../wrapper}/events/PropertyVisibilityEvent.java   |   4 +-
 .../wrapper}/events/ProposedHolderEvent.java       |   4 +-
 .../wrapper}/events/UsabilityEvent.java            |   4 +-
 .../wrapper}/events/ValidityEvent.java             |   4 +-
 .../wrapper}/events/VisibilityEvent.java           |   4 +-
 .../wrapper}/events/package-info.java              |   2 +-
 .../wrapper/listeners/InteractionAdapter.java      |  32 +-
 .../wrapper/listeners/InteractionListener.java     |  32 +-
 .../isis/applib/services/xactn/Transaction.java    |   3 +
 .../isis/applib/services/xactn/Transaction2.java   |  29 -
 .../applib/services/xactn/TransactionService.java  |  52 +-
 .../applib/services/xactn/TransactionService2.java |  33 -
 .../applib/services/xactn/TransactionService3.java |  74 --
 .../apache/isis/applib/snapshot/Snapshottable.java |  35 -
 .../snapshot/SnapshottableWithInclusions.java      |   2 +-
 .../isis/applib/types/MemberIdentifierType.java    |   3 +-
 .../apache/isis/applib/types/TargetActionType.java |   3 +-
 .../apache/isis/applib/types/TargetClassType.java  |   3 +-
 .../apache/isis/applib/util/ObjectContracts.java   |  29 +-
 .../apache/isis/applib/util/ObjectContracts2.java  | 301 --------
 .../java/org/apache/isis/applib/value/Date.java    |   3 +
 .../org/apache/isis/applib/value/DateTime.java     |  11 +-
 .../java/org/apache/isis/applib/value/Time.java    |   3 +
 .../org/apache/isis/applib/value/TimeStamp.java    |   3 +
 .../jdo/applib/annotations/Auditable.java          |  36 -
 .../isis/objectstore/jdo/applib/Auditable.java     |  26 -
 .../applib/service/DomainChangeJdoAbstract.java    | 387 ----------
 .../jdo/applib/service/JdoColumnLength.java        | 187 -----
 .../isis/objectstore/jdo/applib/service/Util.java  |  77 --
 .../jdo/applib/service/support/IsisJdoSupport.java |  28 -
 .../jaxbadapters/PersistentEntityAdapter.java      |   9 +-
 .../apache/isis/applib/ContainedObjectTest.java    | 107 ---
 .../isis/applib/FactoryAndRepositoryTest.java      | 122 ----
 .../isis/applib/events/InteractionEventTest.java   |   1 +
 .../fixturescripts/ExecutionContextTest.java       |  51 --
 .../ExecutionParameters_AsKeyValueMap_Test.java    |  58 ++
 ...tersTest.java => ExecutionParameters_Test.java} |   2 +-
 ...ropertyLayoutData_renderedAsDayBefore_Test.java |  75 ++
 .../component/PropertyLayoutData_repaint_Test.java |  75 ++
 ...tract.java => CommandContractTestAbstract.java} |  66 +-
 .../services/command/CommandDefaultTest.java       |   4 +-
 .../ExceptionRecognizerCompositeTest.java          |  16 +-
 ...onRecognizerCompositeForJdoObjectStoreTest.java |   4 +-
 ...LIntegrityConstraintViolationExceptionTest.java |   4 +-
 .../services/publish/EventMetadataTest_getId.java  |  64 --
 .../queryresultscache/QueryResultsCacheTest.java   |   2 +-
 ...codingServiceWithCompression_Abstract_Test.java |  35 +
 .../org/apache/isis/applib/util/EnumsTest.java     |  16 +-
 core/integtestsupport/pom.xml                      |   2 +-
 .../integtestsupport/IntegrationTestAbstract.java  |   5 +-
 .../integtestsupport/IntegrationTestAbstract2.java |   4 +-
 .../integtestsupport/IntegrationTestAbstract3.java |   3 +-
 .../core/integtestsupport/IsisSystemForTest.java   |   4 -
 .../scenarios/ObjectFactoryForIntegration.java     |   4 +-
 core/log4j/pom.xml                                 |   2 +-
 core/maven-plugin/pom.xml                          |   2 +-
 core/mavendeps/intellij/pom.xml                    |   2 +-
 core/mavendeps/testing/pom.xml                     |   2 +-
 core/mavendeps/webapp/pom.xml                      |   2 +-
 core/metamodel/pom.xml                             |   2 +-
 .../commons/authentication/AnonymousSession.java   |  56 --
 .../isis/core/commons/config/package-info.java     |   6 +-
 .../encoding/DataInputExtendedDecorator.java       |  10 -
 .../apache/isis/core/commons/encoding/encoding.ucd | 166 -----
 .../core/commons/exceptions/ExceptionUtils.java    |  14 +-
 .../isis/core/commons/lang/ArrayExtensions.java    |  73 +-
 .../isis/core/commons/lang/ClassExtensions.java    |  59 +-
 .../isis/core/commons/lang/ClassFunctions.java     |  10 +-
 .../isis/core/commons/lang/ClassMatchers.java      |  43 --
 .../isis/core/commons/lang/ClassPredicates.java    |   1 -
 .../apache/isis/core/commons/lang/ClassUtil.java   |  41 --
 .../core/commons/lang/InputStreamExtensions.java   |   7 -
 .../isis/core/commons/lang/ListExtensions.java     |  45 --
 .../isis/core/commons/lang/MethodExtensions.java   |   6 -
 .../apache/isis/core/commons/lang/NullSafe.java    | 129 ++++
 .../apache/isis/core/commons/lang/Nullable.java    |   7 +
 .../isis/core/commons/lang/ObjectExtensions.java   |  48 --
 .../core/commons/lang/PropertiesExtensions.java    |  47 --
 .../isis/core/commons/lang/ResourceUtil.java       |  32 -
 .../isis/core/commons/lang/RunnableExtensions.java |  33 -
 .../core/commons/lang/StringBuilderExtensions.java |  29 -
 .../isis/core/commons/lang/StringExtensions.java   | 149 ----
 .../isis/core/commons/lang/StringPredicates.java   |   1 -
 .../core/commons/lang/ThrowableExtensions.java     |  21 +-
 .../isis/core/commons/matchers/IsisMatchers.java   | 300 +-------
 .../isis/core/commons/reflection/Reflect.java      | 167 +++++
 .../isis/core/commons/url/UrlDecoderUtil.java}     |  30 +-
 .../isis/core/commons/url/UrlEncodingUtils.java    |  78 --
 .../apache/isis/core/commons/xml/package-info.java |  28 -
 .../isis/core/metamodel/adapter/ObjectAdapter.java |   4 +-
 .../core/metamodel/adapter/mgr/AdapterManager.java |   4 +-
 .../isis/core/metamodel/adapter/oid/Oid.java       |  40 -
 .../core/metamodel/adapter/oid/OidMatchers.java    |  48 --
 .../isis/core/metamodel/adapter/oid/RootOid.java   |   4 +-
 .../core/metamodel/consent/InteractionResult.java  |   2 +-
 .../apache/isis/core/metamodel/facetapi/Facet.java |   1 +
 .../isis/core/metamodel/facetapi/FacetFilters.java |  56 --
 .../isis/core/metamodel/facetapi/FacetHolder.java  |   8 +-
 .../core/metamodel/facetapi/FacetHolderImpl.java   |   6 +-
 .../isis/core/metamodel/facetapi/FacetUtil.java    |  12 +-
 .../isis/core/metamodel/facets/Annotations.java    | 238 ++++--
 .../facets/ContributeeMemberFacetFactory.java      |  45 --
 .../core/metamodel/facets/DomainEventHelper.java   |  16 +-
 .../isis/core/metamodel/facets/FacetFactory.java   |  68 +-
 .../metamodel/facets/FacetedMethodParameter.java   |  20 -
 .../core/metamodel/facets/ImperativeFacet.java     |  10 +-
 .../MethodPrefixBasedFacetFactoryAbstract.java     |   1 -
 .../metamodel/facets/MethodPrefixConstants.java    |  10 -
 .../metamodel/facets/WhenValueFacetAbstract.java   |  44 --
 ...ndWhereValueFacet.java => WhereValueFacet.java} |   3 +-
 ...tAbstract.java => WhereValueFacetAbstract.java} |  11 +-
 .../action/ActionAnnotationFacetFactory.java       | 307 ++------
 .../action/bulk/BulkFacetForActionAnnotation.java  |  25 +-
 .../action/bulk/BulkFacetForBulkAnnotation.java    |  49 --
 .../actions/action/bulk/BulkFacetObjectOnly.java   |   4 +-
 .../command/CommandFacetForActionAnnotation.java   |  82 ++-
 ...ommandFacetForActionAnnotationAsConfigured.java |   8 +-
 .../command/CommandFacetForCommandAnnotation.java  |  54 --
 .../command/CommandFacetFromConfiguration.java     |  10 +-
 ...DisabledFacetForDisabledAnnotationOnAction.java |  46 --
 .../hidden/HiddenFacetForActionAnnotation.java     |  22 +-
 .../HiddenFacetForHiddenAnnotationOnAction.java    |  47 --
 .../invocation/ActionDomainEventFacetAbstract.java |   8 +-
 ...inEventFacetForActionInteractionAnnotation.java |  37 -
 ...tFacetForPostsActionInvokedEventAnnotation.java |  37 -
 ...ctionInvocationFacetForDomainEventAbstract.java |  21 +-
 ...DomainEventFromActionInteractionAnnotation.java |  46 --
 ...nFacetForPostsActionInvokedEventAnnotation.java |  55 --
 .../actions/action/invocation/CommandUtil.java     |  38 +-
 .../PrototypeFacetForActionAnnotation.java         |  14 +-
 .../PrototypeFacetForPrototypeAnnotation.java      |  47 --
 .../PublishedActionFacetForActionAnnotation.java   |  89 ++-
 ...ActionFacetForActionAnnotationAsConfigured.java |   4 +-
 ...hedActionFacetForPublishedActionAnnotation.java |  67 --
 .../PublishedActionFacetFromConfiguration.java     |   4 +-
 ...ctionSemanticsFacetFallbackToNonIdempotent.java |   4 +-
 .../ActionSemanticsFacetForActionAnnotation.java   |  26 +-
 ...SemanticsFacetForActionSemanticsAnnotation.java |  50 --
 ...tionSemanticsFacetFromIdempotentAnnotation.java |  45 --
 ...ctionSemanticsFacetFromQueryOnlyAnnotation.java |  44 --
 .../TypeOfFacetOnActionForTypeOfAnnotation.java    |  50 --
 .../metamodel/facets/actions/bulk/BulkFacet.java   |   6 +-
 .../facets/actions/bulk/BulkFacetAbstract.java     |   6 +-
 .../facets/actions/command/CommandFacet.java       |  11 +-
 .../actions/command/CommandFacetAbstract.java      |  17 +-
 .../MaxLengthFacetOnActionAnnotation.java          |  31 -
 .../MaxLengthFacetOnActionAnnotationFactory.java   |  75 --
 .../PagedFacetForPagedAnnotationOnAction.java      |  34 -
 .../paged/PagedFacetOnActionFactory.java           |  98 ---
 .../paged/PagedFacetPropertiesOnAction.java        |  35 -
 .../PrototypeFacetForExplorationAnnotation.java    |  36 -
 ...totypeFacetForExplorationAnnotationFactory.java |  71 --
 .../annotation/HomePageFacetAnnotationFactory.java |   5 -
 .../ActionNamedExplorationFacetFactory.java        | 121 ---
 .../interaction/ActionNamedFacetFactory.java       |  73 ++
 ...eFacetViaExplorationPrefixNamingConvention.java |  37 -
 .../actions/layout/ActionLayoutFacetFactory.java   |  80 +-
 ...tionPositionFacetForActionLayoutAnnotation.java |  17 +-
 ...nPositionFacetOnActionFromLayoutProperties.java |  54 --
 ...okmarkPolicyFacetForActionLayoutAnnotation.java |  28 +-
 ...arkPolicyFacetOnActionFromLayoutProperties.java |  52 --
 .../CssClassFaFacetForActionLayoutAnnotation.java  |  24 +-
 ...ssClassFaFacetOnActionFromLayoutProperties.java |  60 --
 .../CssClassFacetForActionLayoutAnnotation.java    |  20 +-
 .../CssClassFacetOnActionFromLayoutProperties.java |  46 --
 .../DescribedAsFacetForActionLayoutAnnotation.java |  18 +-
 ...scribedAsFacetOnActionFromLayoutProperties.java |  51 --
 .../HiddenFacetForActionLayoutAnnotation.java      |  21 +-
 .../actions/layout/HiddenFacetForActionXml.java    |   3 +-
 .../HiddenFacetOnActionFromLayoutProperties.java   |  39 -
 .../NamedFacetForActionLayoutAnnotation.java       |  20 +-
 .../NamedFacetOnActionFromLayoutProperties.java    |  67 --
 ...tContributedFacetForActionLayoutAnnotation.java |  32 +-
 .../NotContributedFacetForLayoutProperties.java    |  60 --
 .../PromptStyleFacetForActionLayoutAnnotation.java |  63 +-
 ...omptStyleFacetOnActionFromLayoutProperties.java |  60 --
 .../notcontributed/NotContributedFacet.java        |  31 +-
 .../NotContributedFacetAbstract.java               |  32 +-
 .../annotation/NotContributedFacetAnnotation.java  |  36 -
 .../NotContributedFacetAnnotationFactory.java      |  72 --
 ...tributedFacetDerivedFromDomainServiceFacet.java |   4 +-
 .../NotContributedFacetDerivedFromMixinFacet.java  |   4 +-
 .../notinservicemenu/NotInServiceMenuFacet.java    |   2 +-
 .../NotInServiceMenuFacetAnnotation.java           |  42 --
 .../NotInServiceMenuFacetAnnotationFactory.java    |  72 --
 ...viceMenuFacetDerivedFromDomainServiceFacet.java |   2 +-
 .../method/NotInServiceMenuFacetViaMethod.java     |  53 --
 .../NotInServiceMenuFacetViaMethodFactory.java     |  83 ---
 .../actions/prototype/PrototypeFacetAbstract.java  |   2 +-
 .../actions/publish/PublishedActionFacet.java      |   5 +-
 .../publish/PublishedActionFacetAbstract.java      |  25 +-
 .../PublishedActionPayloadFactoryDefault.java      |  63 --
 .../actions/semantics/ActionSemanticsFacet.java    |   4 +-
 .../semantics/ActionSemanticsFacetAbstract.java    |   7 +-
 .../ActionParameterValidationFacetAbstract.java    |   2 +-
 .../validate/ActionValidationFacetAbstract.java    |   2 +-
 .../metamodel/facets/all/hide/HiddenFacet.java     |   4 +-
 .../CollectionAnnotationFacetFactory.java          | 209 +-----
 .../DisabledFacetForCollectionAnnotation.java      |  44 +-
 ...bledFacetForDisabledAnnotationOnCollection.java |  46 --
 .../hidden/HiddenFacetForCollectionAnnotation.java |  23 +-
 ...HiddenFacetForHiddenAnnotationOnCollection.java |  47 --
 ...ectionAddToFacetForDomainEventFromAbstract.java |   3 +-
 ...inEventFromCollectionInteractionAnnotation.java |  45 --
 ...etForPostsCollectionAddedToEventAnnotation.java |  51 --
 .../modify/CollectionDomainEventFacetAbstract.java |   6 +-
 ...entFacetForCollectionInteractionAnnotation.java |  39 -
 ...etForPostsCollectionAddedToEventAnnotation.java |  39 -
 ...rPostsCollectionRemovedFromEventAnnotation.java |  39 -
 ...nRemoveFromFacetForDomainEventFromAbstract.java |   4 +-
 ...inEventFromCollectionInteractionAnnotation.java |  45 --
 ...rPostsCollectionRemovedFromEventAnnotation.java |  52 --
 .../NotPersistedFacetForCollectionAnnotation.java  |  30 +-
 ...FacetForNotPersistedAnnotationOnCollection.java |  41 --
 ...fFacetOnCollectionFromCollectionAnnotation.java |  24 +-
 ...ypeOfFacetOnCollectionFromTypeOfAnnotation.java |  45 --
 ...abledFacetOnCollectionDerivedFromImmutable.java |   4 +-
 .../layout/CollectionLayoutFacetFactory.java       |  80 +-
 ...CssClassFacetForCollectionLayoutAnnotation.java |  18 +-
 ...ClassFacetOnCollectionFromLayoutProperties.java |  47 --
 ...aultViewFacetForCollectionLayoutAnnotation.java |  16 +-
 ...tViewFacetOnCollectionFromLayoutProperties.java |  48 --
 ...cribedAsFacetForCollectionLayoutAnnotation.java |  18 +-
 ...bedAsFacetOnCollectionFromLayoutProperties.java |  51 --
 .../HiddenFacetForCollectionLayoutAnnotation.java  |  20 +-
 .../layout/HiddenFacetForCollectionXml.java        |   3 +-
 ...iddenFacetOnCollectionFromLayoutProperties.java |  39 -
 .../NamedFacetForCollectionLayoutAnnotation.java   |  17 +-
 ...NamedFacetOnCollectionFromLayoutProperties.java |  66 --
 .../PagedFacetForCollectionLayoutAnnotation.java   |  18 +-
 ...PagedFacetOnCollectionFromLayoutProperties.java |  49 --
 .../RenderFacetForCollectionLayoutAnnotation.java  |  42 --
 ...enderFacetOnCollectionFromLayoutProperties.java |  51 --
 ...SortedByFacetForCollectionLayoutAnnotation.java |  24 +-
 ...tedByFacetOnCollectionFromLayoutProperties.java |  56 --
 .../PagedFacetForPagedAnnotationOnCollection.java  |  34 -
 .../paged/PagedFacetOnCollectionFactory.java       | 100 ---
 .../paged/PagedFacetPropertiesOnCollection.java    |  36 -
 .../annotation/SortedByFacetAnnotation.java        |  37 -
 .../annotation/SortedByFacetAnnotationFactory.java |  38 +-
 .../CollectionValidateAddToFacetAbstract.java      |   2 +-
 .../CollectionValidateRemoveFromFacetAbstract.java |   2 +-
 .../facets/fallback/FallbackFacetFactory.java      |   3 +-
 .../facets/fallback/MaxLengthFacetUnlimited.java   |   2 +-
 .../facets/fallback/NotPersistableFacetNull.java   |  46 --
 .../annotprop/CssClassFacetOnMemberAnnotation.java |  34 -
 .../annotprop/CssClassFacetOnMemberFactory.java    | 106 ---
 .../CssClassFacetOnMemberFromProperties.java       |  36 -
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |  44 +-
 .../annotprop/DescribedAsFacetOnMemberFactory.java |  55 +-
 .../DescribedAsFacetStaticMethodFactory.java       | 119 ---
 .../facets/members/disabled/DisabledFacet.java     |   4 +-
 .../members/disabled/DisabledFacetAbstract.java    |  17 +-
 .../DisabledFacetAbstractAlwaysEverywhere.java     |   3 +-
 .../disabled/DisabledFacetAbstractImpl.java        |  47 +-
 .../disabled/DisabledFacetForContributee.java      |   3 +-
 .../forsession/DisableForSessionFacetAbstract.java |   2 +-
 .../layout/DisabledFacetFromProperties.java        |  56 --
 ...DisabledFacetOnMemberFromPropertiesFactory.java |  56 --
 .../method/DisableForContextFacetNone.java         |   2 +-
 .../method/DisableForContextFacetViaMethod.java    |   2 +-
 .../staticmethod/DisabledFacetForStaticMethod.java |  36 -
 .../DisabledFacetStaticMethodFacetFactory.java     | 120 ---
 .../facets/members/hidden/HiddenFacetAbstract.java |  21 +-
 .../HiddenFacetAbstractAlwaysEverywhere.java       |   5 +-
 .../members/hidden/HiddenFacetAbstractImpl.java    |  31 +-
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   4 +-
 .../forsession/HideForSessionFacetAbstract.java    |   2 +-
 .../layout/HiddenFacetOnMemberFromProperties.java  |  51 --
 .../HiddenFacetOnMemberFromPropertiesFactory.java  |  57 --
 .../hidden/method/HideForContextFacetNone.java     |   2 +-
 .../method/HideForContextFacetViaMethod.java       |   2 +-
 .../staticmethod/HiddenFacetOnStaticMethod.java    |  35 -
 .../HiddenFacetStaticMethodFactory.java            | 121 ---
 .../annotprop/NamedFacetOnMemberAnnotation.java    |  35 -
 .../named/annotprop/NamedFacetOnMemberFactory.java |  92 ---
 .../NamedFacetOnMemberFromProperties.java          |  44 --
 .../named/staticmethod/NamedFacetStaticMethod.java |  57 --
 .../NamedFacetStaticMethodFactory.java             | 122 ----
 .../facets/members/order/MemberOrderFacet.java     |   7 +-
 .../order/annotprop/MemberOrderFacetFactory.java   |  31 +-
 .../facets/members/render/RenderFacet.java         |  35 -
 .../facets/members/render/RenderFacetAbstract.java |  37 -
 .../render/annotprop/RenderFacetAnnotation.java    |  36 -
 .../annotprop/RenderFacetOrResolveFactory.java     | 110 ---
 .../render/annotprop/RenderFacetProperties.java    |  41 --
 .../annotprop/RenderFacetViaResolveAnnotation.java |  36 -
 .../object/actionorder/ActionOrderFacet.java       |  41 --
 .../actionorder/ActionOrderFacetAbstract.java      |  36 -
 .../annotation/ActionOrderFacetAnnotation.java     |  35 -
 .../ActionOrderFacetAnnotationFactory.java         |  72 --
 .../facets/object/audit/AuditableFacet.java        |   2 -
 .../markerifc/AuditableFacetMarkerInterface.java   |  33 -
 .../AuditableFacetMarkerInterfaceFactory.java      |  50 --
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |   1 -
 ...ava => BookmarkPolicyFacetFallbackFactory.java} |  30 +-
 ...okmarkPolicyFacetViaBookmarkableAnnotation.java |  37 -
 .../choices/ChoicesFacetFromBoundedAbstract.java   |   5 +-
 .../ChoicesFacetFromBoundedMarkerInterface.java    |  38 -
 ...icesFacetFromBoundedMarkerInterfaceFactory.java |  66 --
 .../annotation/CssClassFacetOnTypeAnnotation.java  |  35 -
 .../CssClassFacetOnTypeAnnotationFactory.java      |  72 --
 .../DescribedAsFacetOnTypeAnnotation.java          |  35 -
 .../DescribedAsFacetOnTypeAnnotationFactory.java   |  72 --
 .../disabled/DisabledObjectFacetAbstract.java      |   2 +-
 .../DomainObjectAnnotationFacetFactory.java        | 438 +++++------
 .../AuditableFacetForAuditedAnnotation.java        |  43 --
 .../AuditableFacetForDomainObjectAnnotation.java   |  38 +-
 .../ChoicesFacetForDomainObjectAnnotation.java     |  24 +-
 .../choices/ChoicesFacetFromBoundedAnnotation.java |  60 --
 .../ImmutableFacetForDomainObjectAnnotation.java   |  54 +-
 .../editing/ImmutableFacetFromConfiguration.java   |   4 +-
 ...ObjectSpecIdFacetForDomainObjectAnnotation.java |  21 +-
 .../ObjectSpecIdFacetFromObjectTypeAnnotation.java |  41 --
 ...lishedObjectFacetForDomainObjectAnnotation.java |  68 +-
 ...FacetForDomainObjectAnnotationAsConfigured.java |   5 +-
 ...hedObjectFacetForPublishedObjectAnnotation.java |  58 --
 .../PublishedObjectFacetFromConfiguration.java     |   5 +-
 ...atableObjectFacetForDomainObjectAnnotation.java |  59 +-
 ...PolicyFacetForDomainObjectLayoutAnnotation.java |  16 +-
 ...arkPolicyFacetForViewModelLayoutAnnotation.java |  16 +-
 ...lassFaFacetForDomainObjectLayoutAnnotation.java |  24 +-
 ...ssClassFaFacetForViewModelLayoutAnnotation.java |  24 +-
 ...sClassFacetForDomainObjectLayoutAnnotation.java |  17 +-
 .../CssClassFacetForViewModelLayoutAnnotation.java |  18 +-
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |  35 +-
 ...ibedAsFacetForDomainObjectLayoutAnnotation.java |  18 +-
 ...scribedAsFacetForViewModelLayoutAnnotation.java |  18 +-
 .../DomainObjectLayoutFacetFactory.java            |  40 +-
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |  43 +-
 .../NamedFacetForDomainObjectLayoutAnnotation.java |  20 +-
 .../NamedFacetForViewModelLayoutAnnotation.java    |  23 +-
 .../PagedFacetForDomainObjectLayoutAnnotation.java |  15 +-
 .../PagedFacetForViewModelLayoutAnnotation.java    |  14 +-
 ...PluralFacetForDomainObjectLayoutAnnotation.java |  16 +-
 .../PluralFacetForViewModelLayoutAnnotation.java   |  17 +-
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |  43 +-
 .../domainservice/DomainServiceMenuOrder.java      |   2 +-
 .../DomainServiceLayoutFacetFactory.java           |  29 +-
 ...NamedFacetForDomainServiceLayoutAnnotation.java |  20 +-
 ...bleFacetAnnotationElseConfigurationFactory.java |   2 -
 .../facets/object/fieldorder/FieldOrderFacet.java  |  41 --
 .../object/fieldorder/FieldOrderFacetAbstract.java |  36 -
 .../annotation/FieldOrderFacetAnnotation.java      |  35 -
 .../FieldOrderFacetAnnotationFactory.java          |  71 --
 .../object/hidden/HiddenObjectFacetAbstract.java   |   2 +-
 .../annotation/HiddenFacetOnTypeAnnotation.java    |  37 -
 .../HiddenFacetOnTypeAnnotationFactory.java        |  71 --
 .../hidden/method/HiddenObjectFacetViaMethod.java  |   2 +-
 .../RemoveAnnotatedMethodsFacetFactory.java        |   4 +-
 .../facets/object/immutable/ImmutableFacet.java    |  27 +-
 .../object/immutable/ImmutableFacetAbstract.java   |  32 +-
 .../object/immutable/ImmutableFacetUtils.java      |  38 -
 .../ImmutableFacetForImmutableAnnotation.java      |  50 --
 .../ImmutableFacetMarkerInterface.java             |  40 -
 .../ImmutableFacetMarkerInterfaceFactory.java      |  50 --
 .../facets/object/mask/MaskEvaluator.java          | 106 ---
 .../metamodel/facets/object/mask/MaskFacet.java    |  46 --
 .../facets/object/mask/MaskFacetAbstract.java      |  53 --
 .../facets/object/mask/TitleFacetBasedOnMask.java  |  49 --
 .../mask/annotation/MaskFacetOnTypeAnnotation.java |  55 --
 .../MaskFacetOnTypeAnnotationFactory.java          |  76 --
 .../annotation/MaxLengthFacetOnTypeAnnotation.java |  35 -
 .../MaxLengthFacetOnTypeAnnotationFactory.java     |  75 --
 .../annotprop/MemberGroupLayoutFacetFactory.java   |  18 +-
 .../annotprop/MemberGroupsFacetAnnotation.java     |  38 -
 .../mixin/MixinFacetForDomainObjectAnnotation.java |  39 +-
 .../annotation/MultiLineFacetOnTypeAnnotation.java |  35 -
 .../MultiLineFacetOnTypeAnnotationFactory.java     |  76 --
 .../annotation/NamedFacetOnTypeAnnotation.java     |  35 -
 .../NamedFacetOnTypeAnnotationFactory.java         |  73 --
 .../named/staticmethod/NamedFacetStaticMethod.java |  35 -
 .../NamedFacetStaticMethodFactory.java             |  81 ---
 .../object/notpersistable/NotPersistableFacet.java |  36 -
 .../NotPersistableFacetAbstract.java               |  37 -
 .../notpersistable/NotPersistableFacetImpl.java    |  50 --
 .../NotPersistableFacetAnnotation.java             |  32 -
 .../NotPersistableFacetAnnotationFactory.java      |  90 ---
 .../NotPersistableFacetMarkerInterface.java        |  32 -
 .../NotPersistableFacetMarkerInterfaceFactory.java |  90 ---
 .../ObjectValidPropertiesFacetAbstract.java        |   2 +-
 .../impl/ObjectValidPropertiesFacetImpl.java       |   2 +-
 .../PagedFacetOnTypeAnnotationFactory.java         |  78 --
 .../aggregated/AggregatedAnnotationFactory.java    |  76 --
 .../facets/object/parseable/ParserUtil.java        |   2 +-
 .../annotation/PluralAnnotationFacetFactory.java   |  73 --
 .../plural/annotation/PluralFacetAnnotation.java   |  35 -
 .../plural/staticmethod/PluralFacetMethod.java     |  35 -
 .../PluralFacetStaticMethodFactory.java            |  81 ---
 .../PromptStyleFacetFallBackToInline.java          |  35 -
 .../publishedobject/PublishedObjectFacet.java      |  22 +-
 .../PublishedObjectFacetAbstract.java              |  27 +-
 .../PublishedObjectPayloadFactoryDefault.java      |  54 --
 ...etOnCollectionDerivedFromRecreatableObject.java |   3 +-
 ...acetOnPropertyDerivedFromRecreatableObject.java |   3 +-
 .../annotation/RegExFacetOnTypeAnnotation.java     |  63 --
 .../RegExFacetOnTypeAnnotationFactory.java         |  83 ---
 .../TypicalLengthFacetOnTypeAnnotation.java        |  43 --
 .../TypicalLengthFacetOnTypeAnnotationFactory.java |  73 --
 ...cationFromMustSatisfyAnnotationOnTypeFacet.java |   2 +-
 ...romMustSatisfyAnnotationOnTypeFacetFactory.java | 108 ---
 .../ValidateObjectFacetAbstract.java               |   2 +-
 .../value/ImmutableFacetViaValueSemantics.java     |   3 +-
 .../value/vsp/ValueSemanticsProviderUtil.java      |   3 +-
 .../mandatory/MandatoryFacetAbstract.java          |   2 +-
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |   2 +-
 .../MustSatisfySpecificationFacetAbstract.java     |   6 +-
 .../facets/objectvalue/regex/RegExFacet.java       |  17 +-
 .../objectvalue/regex/RegExFacetAbstract.java      |  55 +-
 .../regex/TitleFacetFormattedByRegex.java          |  39 -
 .../facets/param/autocomplete/MinLengthUtil.java   |  10 +-
 ...ameterFromJavaxValidationAnnotationFactory.java |  15 +-
 .../DescribedAsFacetOnParameterAnnotation.java     |  35 -
 ...ameterAnnotationElseDerivedFromTypeFactory.java |  19 +-
 .../CssClassFacetForParameterLayoutAnnotation.java |  20 +-
 ...scribedAsFacetForParameterLayoutAnnotation.java |  20 +-
 .../LabelAtFacetForParameterLayoutAnnotation.java  |  18 +-
 ...MultiLineFacetForParameterLayoutAnnotation.java |  18 +-
 .../NamedFacetForParameterLayoutAnnotation.java    |  20 +-
 .../param/layout/ParameterLayoutFacetFactory.java  |  35 +-
 ...dAdjustedFacetForParameterLayoutAnnotation.java |  27 +-
 ...calLengthFacetForParameterLayoutAnnotation.java |  18 +-
 .../MultiLineFacetOnParameterAnnotation.java       |  49 --
 ...MultiLineFacetOnParameterAnnotationFactory.java |  96 ---
 .../NamedFacetOnParameterAnnotation.java           |  40 -
 .../NamedFacetOnParameterAnnotationFactory.java    |  83 ---
 .../parameter/ParameterAnnotationFacetFactory.java | 178 +----
 .../FileAcceptFacetForParameterAnnotation.java     |  22 +-
 .../MandatoryFacetForParameterAnnotation.java      |  38 +-
 ...cetInvertedByNullableAnnotationOnParameter.java |   4 +-
 ...cetInvertedByOptionalAnnotationOnParameter.java |  56 --
 ...ngthFacetForMaxLengthAnnotationOnParameter.java |  41 --
 .../MaxLengthFacetForParameterAnnotation.java      |  18 +-
 ...onFacetForMustSatisfyAnnotationOnParameter.java |  62 --
 ...fySpecificationFacetForParameterAnnotation.java |  32 +-
 .../regex/RegExFacetForParameterAnnotation.java    |  52 +-
 ...RegExFacetForPatternAnnotationOnParameter.java} |  49 +-
 .../RegExFacetFromRegExAnnotationOnParameter.java  |  82 ---
 ...deredAsDayBeforeFacetOnParameterAnnotation.java |  37 -
 ...DayBeforeFacetOnParameterAnnotationFactory.java |  80 --
 ...calLengthFacetOnParameterAnnotationFactory.java |  81 ---
 .../maskannot/MaskFacetOnParameterAnnotation.java  |  55 --
 .../MaskFacetOnParameterAnnotationFactory.java     | 103 ---
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   7 +-
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   2 +-
 .../MandatoryFacetOnPropertyStaticMethod.java      |  40 -
 ...andatoryFacetOnPropertyStaticMethodFactory.java | 112 ---
 .../MultiLineFacetOnPropertyFactory.java           | 105 ---
 .../MultiLineFacetOnPropertyFromProperties.java    |  43 --
 .../property/PropertyAnnotationFacetFactory.java   | 274 ++-----
 .../command/CommandFacetForPropertyAnnotation.java |  65 +-
 ...mandFacetForPropertyAnnotationAsConfigured.java |   8 +-
 ...sabledFacetForDisabledAnnotationOnProperty.java |  46 --
 .../DisabledFacetForPropertyAnnotation.java        |  53 +-
 ...acetForPropertyAnnotationInvertedSemantics.java |   3 +-
 .../FileAcceptFacetForPropertyAnnotation.java      |  22 +-
 .../HiddenFacetForHiddenAnnotationOnProperty.java  |  47 --
 .../hidden/HiddenFacetForPropertyAnnotation.java   |  27 +-
 ...atoryFacetForMandatoryAnnotationOnProperty.java |  51 --
 .../MandatoryFacetForPropertyAnnotation.java       |  36 +-
 ...acetInvertedByOptionalAnnotationOnProperty.java |  56 --
 ...engthFacetForMaxLengthAnnotationOnProperty.java |   5 -
 .../MaxLengthFacetForPropertyAnnotation.java       |  17 +-
 ...mainEventFromPropertyInteractionAnnotation.java |  46 --
 ...acetForPostsPropertyChangedEventAnnotation.java |  53 --
 .../modify/PropertyDomainEventFacetAbstract.java   |   6 +-
 ...acetForPostsPropertyChangedEventAnnotation.java |  41 --
 ...EventFacetForPropertyInteractionAnnotation.java |  41 --
 ...mainEventFromPropertyInteractionAnnotation.java |  46 --
 ...acetForPostsPropertyChangedEventAnnotation.java |  53 --
 ...tySetterOrClearFacetForDomainEventAbstract.java |  11 +-
 ...ionFacetForMustSatisfyAnnotationOnProperty.java |  63 --
 ...sfySpecificationFacetForPropertyAnnotation.java |  32 +-
 ...edFacetForNotPersistedAnnotationOnProperty.java |  40 -
 .../NotPersistedFacetForPropertyAnnotation.java    |  21 +-
 ...ublishedPropertyFacetForPropertyAnnotation.java |  53 +-
 ... RegExFacetForPatternAnnotationOnProperty.java} |  56 +-
 .../regex/RegExFacetForPropertyAnnotation.java     |  39 +-
 .../CssClassFacetForPropertyLayoutAnnotation.java  |  20 +-
 ...ssClassFacetOnPropertyFromLayoutProperties.java |  46 --
 ...escribedAsFacetForPropertyLayoutAnnotation.java |  20 +-
 ...ribedAsFacetOnPropertyFromLayoutProperties.java |  51 --
 .../HiddenFacetForPropertyLayoutAnnotation.java    |  21 +-
 .../propertylayout/HiddenFacetForPropertyXml.java  |   3 +-
 .../HiddenFacetOnPropertyFromLayoutProperties.java |  39 -
 .../LabelAtFacetForPropertyLayoutAnnotation.java   |  18 +-
 ...LabelAtFacetOnPropertyFromLayoutProperties.java |  55 --
 .../MultiLineFacetForPropertyLayoutAnnotation.java |  17 +-
 ...ltiLineFacetOnPropertyFromLayoutProperties.java |  49 --
 .../NamedFacetForPropertyLayoutAnnotation.java     |  18 +-
 .../NamedFacetOnPropertyFromLayoutProperties.java  |  67 --
 ...romptStyleFacetForPropertyLayoutAnnotation.java |  69 +-
 ...ptStyleFacetOnPropertyFromLayoutProperties.java |  60 --
 .../propertylayout/PropertyLayoutFacetFactory.java | 147 ++--
 ...edAdjustedFacetForPropertyLayoutAnnotation.java |  27 +-
 ...djustedFacetOnPropertyFromLayoutProperties.java |  49 --
 ...icalLengthFacetForPropertyLayoutAnnotation.java |  18 +-
 ...lLengthFacetOnPropertyFromLayoutProperties.java |  57 --
 ...UnchangingFacetForPropertyLayoutAnnotation.java |  30 +-
 ...hangingFacetOnPropertyFromLayoutProperties.java |  49 --
 ...sDayBeforeAnnotationOnPropertyFacetFactory.java |  74 --
 .../TypicalLengthOnPropertyFacetFactory.java       |  96 ---
 .../update/PropertySetAndClearFacetFactory.java    |   1 -
 .../validating/PropertyValidateFacetAbstract.java  |   2 +-
 .../dflt/PropertyValidateFacetDefault.java         |   2 +-
 .../maskannot/MaskFacetOnPropertyAnnotation.java   |  51 --
 .../MaskFacetOnPropertyAnnotationFactory.java      | 123 ----
 .../value/datejdk8local/Jdk8LocalDateUtil.java     | 169 +++++
 .../datejdk8local/Jdk8LocalDateValueFacet.java}    |  14 +-
 ...teValueFacetUsingSemanticsProviderFactory.java} |  26 +-
 .../Jdk8LocalDateValueSemanticsProvider.java       | 274 +++++++
 .../value/datejdk8local/TimeFormatter.java}        |   9 +-
 .../facets/value/datejdk8local/TimeParser.java}    |   7 +-
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   | 157 ++++
 .../Jdk8LocalDateTimeValueFacet.java}              |  18 +-
 ...meValueFacetUsingSemanticsProviderFactory.java} |  38 +-
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   | 275 +++++++
 .../datetimejdk8local/TimeFormatter.java}          |   9 +-
 .../value/datetimejdk8local/TimeParser.java}       |   7 +-
 .../Jdk8OffsetDateTimeValueFacet.java}             |  18 +-
 ...meValueFacetUsingSemanticsProviderFactory.java} |  25 +-
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  | 104 +++
 ...fsetDateTimeValueSemanticsProviderAbstract.java | 120 +++
 .../core/metamodel/interactions/AccessContext.java |   2 +-
 .../interactions/ActionArgValidityContext.java     |   2 +-
 .../interactions/ActionUsabilityContext.java       |   2 +-
 .../interactions/ActionValidityContext.java        |   2 +-
 .../interactions/ActionVisibilityContext.java      |   2 +-
 .../interactions/CollectionAccessContext.java      |   2 +-
 .../interactions/CollectionAddToContext.java       |   2 +-
 .../interactions/CollectionRemoveFromContext.java  |   2 +-
 .../interactions/CollectionUsabilityContext.java   |   2 +-
 .../interactions/CollectionVisibilityContext.java  |   2 +-
 .../interactions/DisablingInteractionAdvisor.java  |   2 +-
 .../interactions/HidingInteractionAdvisor.java     |   2 +-
 .../metamodel/interactions/InteractionContext.java |   2 +-
 .../metamodel/interactions/InteractionUtils.java   |  22 +-
 .../metamodel/interactions/ObjectTitleContext.java |   2 +-
 .../interactions/ObjectValidityContext.java        |   2 +-
 .../interactions/ObjectVisibilityContext.java      |   4 +-
 .../metamodel/interactions/ParseValueContext.java  |   2 +-
 .../interactions/PropertyAccessContext.java        |   2 +-
 .../interactions/PropertyModifyContext.java        |   2 +-
 .../interactions/PropertyUsabilityContext.java     |   2 +-
 .../interactions/PropertyVisibilityContext.java    |   2 +-
 .../metamodel/interactions/UsabilityContext.java   |   2 +-
 .../interactions/ValidatingInteractionAdvisor.java |   2 +-
 .../metamodel/interactions/ValidityContext.java    |   2 +-
 .../metamodel/interactions/VisibilityContext.java  |   2 +-
 .../layoutmetadata/ActionLayoutFacetRepr.java      |  37 -
 .../core/metamodel/layoutmetadata/ActionRepr.java  |  52 --
 .../layoutmetadata/CollectionLayoutFacetRepr.java  |  35 -
 .../core/metamodel/layoutmetadata/ColumnRepr.java  |  25 -
 .../layoutmetadata/CssClassFaFacetRepr.java        |  23 -
 .../layoutmetadata/CssClassFacetRepr.java          |  22 -
 .../layoutmetadata/DescribedAsFacetRepr.java       |  22 -
 .../layoutmetadata/DisabledFacetRepr.java          |  26 -
 .../metamodel/layoutmetadata/HiddenFacetRepr.java  |  26 -
 .../metamodel/layoutmetadata/LayoutMetadata.java   |  40 -
 .../layoutmetadata/LayoutMetadataReader.java       |  52 --
 .../layoutmetadata/LayoutMetadataReader2.java      | 100 ---
 .../metamodel/layoutmetadata/MemberGroupRepr.java  |  23 -
 .../core/metamodel/layoutmetadata/MemberRepr.java  |  96 ---
 .../layoutmetadata/MultiLineFacetRepr.java         |  22 -
 .../metamodel/layoutmetadata/NamedFacetRepr.java   |  22 -
 .../metamodel/layoutmetadata/PagedFacetRepr.java   |  21 -
 .../layoutmetadata/PropertyLayoutFacetRepr.java    |  37 -
 .../metamodel/layoutmetadata/RenderFacetRepr.java  |  23 -
 .../layoutmetadata/TypicalLengthFacetRepr.java     |  23 -
 .../json/LayoutMetadataReaderFromJson.java         | 714 ------------------
 .../LayoutMetadataReaderFromPropertyFile.java      |  41 --
 .../core/metamodel/services/ServicesInjector.java  |   2 -
 .../services/appfeat/ApplicationFeature.java       |   7 -
 .../ApplicationFeatureRepositoryDefault.java       |  18 +-
 .../bookmarks/BookmarkServiceInternalDefault.java  |  12 +-
 .../command/CommandDtoServiceInternal.java         |   9 -
 .../container/DomainObjectContainerDefault.java    | 453 +-----------
 .../container/query/QueryFindByPattern.java        |  57 --
 .../services/container/query/QueryFindByTitle.java |  56 --
 .../exceprecog/ExceptionRecognizerDocDefault.java  | 105 +++
 .../services/grid/GridLoaderServiceDefault.java    |   6 +-
 .../services/grid/GridSystemServiceAbstract.java   |   4 +-
 .../grid/bootstrap3/GridSystemServiceBS3.java      |   4 +-
 .../metamodel/MetaModelServiceDefault.java         |   8 +-
 .../PersistenceSessionServiceInternal.java         |   8 +-
 .../PersistenceSessionServiceInternalNoop.java     |   8 +-
 .../publishing/PublishingServiceInternal.java      |  11 +-
 .../services/registry/ServiceRegistryDefault.java  |   4 +-
 .../services/swagger/internal/Generation.java      |   8 +-
 .../metamodel/services/swagger/internal/Util.java  |  27 +-
 .../services/xactn/TransactionServiceDefault.java  |  12 +-
 .../core/metamodel/spec/ObjectSpecification.java   |  10 -
 .../isis/core/metamodel/spec/Persistability.java   |  54 --
 .../core/metamodel/spec/feature/ObjectAction.java  | 193 ++---
 .../spec/feature/ObjectActionContainer.java        |   6 +-
 .../spec/feature/ObjectActionParameter.java        |  16 +-
 .../core/metamodel/spec/feature/ObjectActions.java |   8 +-
 .../metamodel/spec/feature/ObjectAssociation.java  | 236 +-----
 .../spec/feature/ObjectAssociationContainer.java   |  10 +-
 .../spec/feature/ObjectAssociationFilters.java     |  85 ---
 .../core/metamodel/spec/feature/ObjectMember.java  |   6 +-
 .../spec/feature/OneToOneAssociation.java          |  20 +-
 .../metamodel/specloader/ReflectorConstants.java   |   7 -
 .../metamodel/specloader/SpecificationLoader.java  |  11 +-
 .../specloader/facetprocessor/FacetProcessor.java  |  33 +-
 .../specloader/specimpl/FacetedMethodsBuilder.java | 148 +---
 .../specimpl/FacetedMethodsBuilderContext.java     |   5 -
 .../specimpl/ObjectActionContributee.java          |   6 +-
 .../specloader/specimpl/ObjectActionDefault.java   |  25 +-
 .../specimpl/ObjectActionParameterAbstract.java    |  14 +-
 .../specloader/specimpl/ObjectMemberAbstract.java  |  12 +-
 .../specimpl/ObjectSpecificationAbstract.java      |  87 +--
 .../specimpl/OneToManyAssociationContributee.java  |   2 -
 .../specimpl/OneToManyAssociationMixedIn.java      |   2 -
 .../specimpl/OneToOneAssociationContributee.java   |   2 -
 .../specimpl/OneToOneAssociationMixedIn.java       |   2 -
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  44 +-
 .../standard/AuthorizationFacetAbstract.java       |   4 +-
 ...AuditableAnnotationInJdoApplibFacetFactory.java |  81 ---
 .../AuditableFacetAnnotationInJdoApplib.java       |  33 -
 .../AuditableFacetMarkerInterfaceInJdoApplib.java  |  32 -
 ...ableMarkerInterfaceInJdoApplibFacetFactory.java |  56 --
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   2 +-
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |  10 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  10 +-
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |   3 +-
 ...er.java => JdoPrimaryKeyPropertyPredicate.java} |   6 +-
 .../isis/progmodels/dflt/JavaReflectorHelper.java  |   5 +-
 .../dflt/ProgrammingModelFacetsJava5.java          | 145 +---
 .../AggregatedAnnotationFactory.java               |   1 -
 .../IsisMatchers_ContainsStripNewLinesTest.java    |  68 --
 .../IsisMatchers_EndsWithStripNewLinesTest.java    |  63 --
 .../IsisMatchers_EqualToStripNewLinesTest.java     |  63 --
 .../IsisMatchers_NonEmptyStringOrNullTest.java     |  53 --
 .../IsisMatchers_StartsWithStripNewLinesTest.java  |  63 --
 .../core/metamodel/facetapi/FacetFiltersTest.java  | 159 ----
 .../Annotations_getAnnotations_on_Class_Test.java  | 166 +++++
 .../Annotations_getAnnotations_on_Field_Test.java  | 190 +++++
 .../Annotations_getAnnotations_on_Method_Test.java | 177 +++++
 ...notations_getAnnotations_on_Parameter_Test.java | 191 +++++
 ...nEventHelperTest_newActionInteractionEvent.java |  30 +-
 ...HelperTest_newCollectionDomainEvent_forAdd.java |  21 +-
 ...perTest_newCollectionDomainEvent_forRemove.java |  23 +-
 ...HelperTest_newPropertyDomainEvent_forClear.java |  23 +-
 ...elperTest_newPropertyDomainEvent_forModify.java |   8 -
 .../actions/ActionMethodsFacetFactoryTest.java     | 186 +----
 .../action/ActionAnnotationFacetFactoryTest.java   | 389 +++-------
 ...nnotationFacetFactoryTest_actionInvocation.java |  12 +-
 ...otationFacetFactoryTest_forActionSemantics.java |  65 --
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   2 +-
 ...DisabledAnnotationOnActionFacetFactoryTest.java | 174 -----
 .../HiddenAnnotationOnActionFacetFactoryTest.java  | 157 ----
 .../IdempotentFacetAnnotationFactoryTest.java      |  64 --
 .../PrototypeFacetAnnotationFactoryTest.java       |   7 +-
 .../QueryOnlyFacetAnnotationFactoryTest.java       |  65 --
 ...kmarkableAnnotationFacetFactoryTest_action.java |  11 +-
 ...peFacetForExplorationAnnotationFactoryTest.java |  68 --
 .../HomePageAnnotationFacetFactoryTest.java        |   2 +-
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |  32 +-
 ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java |  12 +-
 .../NotContributedFacetAnnotationFactoryTest.java  | 104 ---
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  10 +-
 ...NotInServiceMenuAnnotationFacetFactoryTest.java |  65 --
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  10 +-
 .../NotInServiceMenuMethodFacetFactoryTest.java    |  74 --
 .../CollectionFieldMethodsFacetFactoryTest.java    | 158 +---
 .../CollectionAnnotationFacetFactoryTest.java      | 130 +---
 ...ollectionAnnotationFacetFactoryTest_typeOf.java | 152 +---
 ...bledAnnotationOnCollectionFacetFactoryTest.java |   7 +-
 ...ddenAnnotationOnCollectionFacetFactoryTest.java |  64 --
 ...stedAnnotationOnCollectionFacetFactoryTest.java |  11 +-
 ...etForCollectionLayoutAnnotationFactoryTest.java |   4 +-
 .../SortedByFacetAnnotationFactoryTest.java        | 108 ---
 ...CssClassAnnotationOnMemberFacetFactoryTest.java |  58 --
 ...ationFacetFactoryTest_withRenderAnnotation.java | 161 ----
 ...tionFacetFactoryTest_withResolveAnnotation.java | 160 ----
 .../DescribedAsAnnotationFacetFactoryTest.java     | 144 ----
 .../named/NamedAnnotationFacetFactoryTest.java     | 157 ----
 ...agedAnnotationOnCollectionFacetFactoryTest.java |  92 ---
 .../PagedFacetOnTypeAnnotationFactoryTest.java     |  85 ---
 .../ViewModelSemanticCheckingFacetFactoryTest.java |   1 +
 ...okmarkableAnnotationFacetFactoryTest_class.java |  34 +-
 ...FacetFromBoundedMarkerInterfaceFactoryTest.java |  61 --
 .../callback/CreatedCallbackFacetFactoryTest.java  |   2 +-
 .../callback/DeleteCallbackFacetFactoryTest.java   |   4 +-
 .../CssClassFacetOnTypeAnnotationFactoryTest.java  |  59 --
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   7 +-
 .../DomainObjectAnnotationFacetFactoryTest.java    | 263 ++-----
 ...ObjectAnnotationFacetFactoryTest_immutable.java | 125 ----
 .../ObjectTypeAnnotationFacetFactoryTest.java      |  11 +-
 .../DomainObjectLayoutFactoryTest.java             |  71 +-
 .../DomainServiceFacetAnnotationFactoryTest.java   |   2 +-
 .../DomainServiceLayoutFacetFactoryTest.java       |   8 +-
 .../plural/PluralAnnotationFacetFactoryTest.java   |  63 --
 .../ident/plural/PluralFacetMethodFactoryTest.java |  68 --
 .../singular/SingularMethodFacetFactoryTest.java   |  68 --
 .../ImmutableFacetMarkerInterfaceFactoryTest.java  | 110 ---
 .../MemberGroupLayoutFacetFactoryTest.java         |  29 -
 .../NotPersistableFacetAnnotationFactoryTest.java  |  98 ---
 ...PersistableMarkerInterfaceFacetFactoryTest.java |  80 --
 .../AggregatedAnnotationFactoryTest.java           |  58 --
 .../ActionOrderFacetAnnotationFactoryTest.java     |  63 --
 .../FieldOrderFacetAnnotationFactoryTest.java      |  63 --
 .../MemberOrderAnnotationFacetFactoryTest.java     |   6 +-
 ...cificationFacetFactoryProcessParameterTest.java | 124 ----
 .../ParameterAnnotationFacetFactoryTest.java       |   4 +-
 ...ableAnnotationOnParameterFacetFactoryTest.java} |  53 +-
 ...RegExAnnotationOnParameterFacetFactoryTest.java |  19 +-
 .../PropertyMethodsFacetFactoryTest.java           | 156 +---
 ...romptStyleFacetFromPropertyAnnotation_Test.java |  61 +-
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |  14 +-
 ...HiddenAnnotationOnPropertyFacetFactoryTest.java |  64 --
 .../MandatoryAnnotationFacetFactoryTest.java       |  12 +-
 ...ecificationFacetFactoryProcessPropertyTest.java | 119 ---
 ...sistedAnnotationOnPropertyFacetFactoryTest.java |  14 +-
 .../PropertyAnnotationFacetFactoryTest.java        | 120 ++-
 ...lableAnnotationOnPropertyFacetFactoryTest.java} |  58 +-
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |  22 +-
 ...acetForPropertyLayoutAnnotationFactoryTest.java |   9 +-
 ...acetForPropertyLayoutAnnotationFactoryTest.java |  16 +-
 ...ValidationDigitsAnnotationFacetFactoryTest.java |   2 +-
 .../MultiLineAnnotationFacetFactoryTest.java       | 147 ----
 ...deredAsDayBeforeAnnotationFacetFactoryTest.java |  79 --
 .../DomainObjectWithMustSatisfyAnnotations.java    |  13 +-
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   8 +-
 ...SpecificationFacetFactoryInstantiationTest.java |  33 -
 .../TypicalLengthAnnotationFacetFactoryTest.java   |  77 --
 .../mask/MaskAnnotationFacetFactoryTest.java       | 147 ----
 .../propparam/validate/mask/MaskEvaluatorTest.java |  80 --
 .../RegExAnnotationOnTypeFacetFactoryTest.java     |  48 --
 .../validate/regex/RegExFacetAnnotationTest.java   | 101 ---
 ...ectAssociationPredicatesTest_visibleWhere.java} |  78 +-
 .../interactions/InteractionUtils_isA_Test.java    | 103 +++
 .../layoutmetadata/json/ExampleDomainObject.java   |  21 -
 .../LayoutMetadataReaderFromJsonTest_read.java     | 109 ---
 ...outMetadataReaderFromJsonTest_readMetadata.java | 113 ---
 .../ApplicationFeatureRepositoryDefaultTest.java   |  43 +-
 .../services/appfeat/ApplicationFeatureTest.java   |   6 -
 ...ptionRecognizerDocDefault_recognizes_Test.java} |  12 +-
 .../isis/core/metamodel/spec/PersistableTest.java  |  53 --
 .../ObjectReflectorDefaultTest_object.java         |   2 -
 .../SpecificationLoaderTestAbstract.java           |   5 +-
 ...ionParameterAbstractTest_getId_and_getName.java |   8 +-
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  18 +-
 .../testspec/ObjectSpecificationStub.java          |  32 +-
 .../GivenAuditableAnnotationFacetFactoryTest.java  |  99 ---
 ...enAuditableFacetMarkerInterfaceFactoryTest.java |  99 ---
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  10 +-
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  16 +-
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |   8 +-
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |  10 +-
 .../json/ExampleDomainObject.layout.json           | 136 ----
 .../json/ExampleDomainObject.layout.properties     | 106 ---
 core/pom.xml                                       |  74 +-
 core/runtime/pom.xml                               |   2 +-
 .../ObjectFixtureFilePersistor.java                | 243 -------
 .../fixturedomainservice/ObjectFixtureService.java | 268 -------
 .../fixtures/FixturesInstallerDelegate.java        |   4 +-
 .../FixturesInstallerFromConfiguration.java        |   4 -
 .../domainservice/ObjectLoaderFixture.java         |  47 --
 .../core/runtime/headless/HeadlessAbstract.java    |  12 +-
 .../HeadlessWithBootstrappingAbstract.java         |   4 +-
 .../runtime/headless/IsisSystemBootstrapper.java   |  10 +-
 .../query/PersistenceQueryAbstract.java            |  32 +-
 .../persistence/query/PersistenceQueryBuiltIn.java |  45 --
 .../query/PersistenceQueryBuiltInAbstract.java     |  74 --
 .../query/PersistenceQueryFindAllInstances.java    |  29 +-
 .../query/PersistenceQueryFindByPattern.java       | 117 ---
 .../query/PersistenceQueryFindByTitle.java         |  66 --
 ...ersistenceQueryFindUsingApplibQueryDefault.java |  35 +-
 ...tenceQueryFindUsingApplibQuerySerializable.java |  89 ---
 .../isis/core/runtime/runner/IsisInjectModule.java |  59 +-
 .../runtime/runner/opts/OptionHandlerDebug.java    |  56 --
 .../runtime/runner/opts/OptionHandlerQuiet.java    |  56 --
 .../runtime/runner/opts/OptionHandlerVerbose.java  |  57 --
 .../ServicesInstallerFromConfiguration.java        |  59 +-
 .../services/auditing/AuditingServiceInternal.java |  21 +-
 .../background/BackgroundCommandExecution.java     | 195 ++---
 .../background/BackgroundServiceDefault.java       |  26 +-
 .../services/changes/AdapterAndProperty.java       |  19 +-
 .../changes/ChangedObjectsServiceInternal.java     |  22 +-
 .../command/CommandDtoServiceInternalDefault.java  |  38 -
 .../services/command/CommandServiceDefault.java    |   7 -
 .../services/eventbus/EventBusServiceDefault.java  |   6 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   4 +-
 .../PersistenceSessionServiceInternalDefault.java  |   8 +-
 .../services/publish/PublishedObjectsDefault.java  |  28 +-
 .../publish/PublishingServiceInternalDefault.java  | 315 +-------
 .../core/runtime/system/context/IsisContext.java   |  15 +-
 .../persistence/PersistenceQueryFactory.java       |  23 +-
 .../system/persistence/PersistenceSession.java     |  42 +-
 .../PersistenceSessionFactoryMetamodelRefiner.java |   4 -
 .../system/transaction/IsisTransaction.java        |   4 +-
 .../IsisComponentProvider.java                     |  38 +-
 .../IsisComponentProviderUsingInstallers.java      |  23 +-
 .../isis/core/webapp/IsisWebAppBootstrapper.java   |   7 -
 .../datanucleus/metamodel/JdoPropertyUtils.java    |  14 +-
 .../service/support/IsisJdoSupportImpl.java        |   2 +-
 ...rdAuthenticationManager_AuthenticationTest.java |  28 +-
 .../runtime/system/ObjectMemberAbstractTest.java   |  47 +-
 .../system/TypeExtractorMethodReturnTest.java      |   2 +-
 .../system/TypeExtractorMethodsParametersTest.java |  36 +-
 core/schema/pom.xml                                |   2 +-
 core/security-shiro/pom.xml                        |   6 +-
 core/security/pom.xml                              |   2 +-
 core/specsupport/pom.xml                           |   2 +-
 .../scenarios/DomainServiceProvider.java           |   2 -
 .../scenarios/DomainServiceProviderMockery.java    |  44 +-
 .../specsupport/scenarios/ScenarioExecution.java   |   7 +-
 core/unittestsupport/pom.xml                       |   2 +-
 .../jmocking/JMockActionsTest_returnArgument.java  |   8 +-
 ...ockery2Test_mockAnnotatedWithNever_sadCase.java |   3 +-
 core/viewer-restfulobjects-applib/pom.xml          |   2 +-
 .../restfulobjects/applib/util/ParserTest.java     |  38 +-
 core/viewer-restfulobjects-rendering/pom.xml       |   2 +-
 .../restfulobjects/rendering/RendererContext.java  |   1 -
 .../domainobjects/DomainObjectReprRenderer.java    |   4 -
 .../rendering/domainobjects/InvokeKeys.java        |  20 +-
 .../rendering/domainobjects/MemberType.java        |   1 -
 .../domainobjects/ObjectActionReprRenderer.java    |   6 +-
 .../ObjectCollectionReprRenderer.java              |  13 +-
 .../domainobjects/ObjectPropertyReprRenderer.java  |  14 +-
 .../RepresentationServiceForRestfulObjects.java    |  24 -
 .../service/conmap/ContentMappingService.java      |  41 --
 .../ContentNegotiationServiceXRoDomainType.java    |  23 +-
 core/viewer-restfulobjects-server/pom.xml          |   2 +-
 .../resources/DomainObjectResourceServerside.java  |   5 +-
 .../server/resources/DomainResourceHelper.java     |  10 +-
 .../resources/DomainServiceResourceServerside.java |   5 +-
 .../resources/ObjectAdapterUpdateHelper.java       |   2 +-
 .../server/resources/ResourceAbstract.java         |   7 +-
 core/viewer-wicket-applib/pom.xml                  |   2 +-
 core/viewer-wicket-impl/pom.xml                    |   2 +-
 .../integration/wicket/WebRequestCycleForIsis.java |  16 +-
 .../ComponentFactoryRegistrarDefault.java          |   7 +
 core/viewer-wicket-model/pom.xml                   |   2 +-
 .../viewer/wicket/model/links/LinkAndLabel.java    |   5 +-
 .../wicket/model/mementos/ActionMemento.java       |   4 +-
 .../model/mementos/ObjectAdapterMemento.java       |  33 -
 .../wicket/model/models/BookmarkTreeNode.java      |   2 +-
 .../isis/viewer/wicket/model/util/OidMatchers.java |  51 --
 .../models/LowestCommonSuperclassClosureTest.java  |   2 +-
 core/viewer-wicket-ui/pom.xml                      |   2 +-
 .../actionlink/ActionLinkPanelFactory.java         |   4 +-
 .../components/actions/ActionParametersForm.java   |   4 +-
 .../collection/bulk/BulkActionsHelper.java         |   9 +-
 .../collection/bulk/BulkActionsLinkFactory.java    |  10 -
 .../selector/CollectionSelectorHelper.java         |  12 +-
 .../CollectionContentsAsAjaxTablePanel.java        |  41 +-
 .../CollectionContentsAsSummaryFactory.java        |   6 +-
 .../jdk8time/DateConverterForJdk8Abstract.java     |  62 ++
 .../jdk8time/DateConverterForJdk8LocalDate.java    |  64 ++
 .../DateConverterForJdk8LocalDateTime.java         |  76 ++
 .../DateConverterForJdk8OffsetDateTime.java        |  92 +++
 .../scalars/jdk8time/Jdk8LocalDatePanel.java}      |  22 +-
 .../jdk8time/Jdk8LocalDatePanelFactory.java}       |  25 +-
 .../scalars/jdk8time/Jdk8LocalDateTimePanel.java   |  52 ++
 .../jdk8time/Jdk8LocalDateTimePanelFactory.java}   |  29 +-
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java  |  51 ++
 .../jdk8time/Jdk8OffsetDateTimePanelFactory.java}  |  29 +-
 .../DateConverterForJdk8LocalDateTest.java         |  75 ++
 .../DateConverterForJdk8LocalDateTimeTest.java     |  97 +++
 .../DateConverterForJdk8OffsetDateTimeTest.java    | 107 +++
 core/webserver/pom.xml                             |   2 +-
 core/wrapper/pom.xml                               |   2 +-
 .../isis/core/wrapper/WrapperFactoryDefault.java   |  34 +-
 .../dispatchers/InteractionEventDispatcher.java    |   2 +-
 .../InteractionEventDispatcherTypeSafe.java        |   2 +-
 .../AbstractCollectionInvocationHandler.java       |   4 +-
 .../DelegatingInvocationHandlerDefault.java        |   2 +-
 .../handlers/DomainObjectInvocationHandler.java    |  45 +-
 .../isis/core/wrapper/proxy/ProxyCreator.java      |   3 +-
 ...FactoryDefaultTest_wrappedObject_transient.java |  14 +-
 .../progmodel/wrapper/dom/employees/Employee.java  |   8 +-
 .../wrapper/dom/employees/EmployeeRepository.java  |   4 +-
 .../application/helloworld/nb-configuration.xml    |  19 +
 example/application/helloworld/nbactions.xml       |  50 ++
 example/application/helloworld/pom.xml             |   4 +-
 .../java/domainapp/dom/impl/HelloWorldObject.java  |   2 +
 .../java/domainapp/dom/impl/HelloWorldObjects.java |   1 +
 .../src/main/webapp/META-INF/context.xml           |   2 +
 example/application/simpleapp/application/pom.xml  |   2 +-
 .../fixture/scenarios/DomainAppDemo.java           |   6 +-
 .../application/simpleapp/module-simple/pom.xml    |   2 +-
 .../modules/simple/dom/impl/SimpleObject.java      |  17 +-
 .../domainapp/modules/simple/dom/types/Name.java   |  32 +
 .../simple/fixture/SimpleObject_persona.java       |   6 +-
 example/application/simpleapp/pom.xml              |   7 +-
 example/application/simpleapp/webapp/pom.xml       |   2 +-
 example/archetype/helloworld/pom.xml               |   2 +-
 example/archetype/simpleapp/pom.xml                |   4 +-
 .../simple/dom/impl/SimpleObjectRepository.java    |  58 ++
 .../simple/dom/impl/SimpleObjects_Test.java        |   6 +
 pom.xml                                            |   2 +-
 todo-deprecation-list.txt                          | 497 +++++++++++++
 1252 files changed, 10126 insertions(+), 39986 deletions(-)

diff --cc core/applib/pom.xml
index cea4c42,cea4c42..8ba1faa
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-applib</artifactId>
diff --cc core/integtestsupport/pom.xml
index a637d0c,a637d0c..b32bea4
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-integtestsupport</artifactId>
diff --cc core/log4j/pom.xml
index 131df8c,131df8c..e3c2e61
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@@ -15,7 -15,7 +15,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-log4j</artifactId>
diff --cc core/maven-plugin/pom.xml
index 3dbc420,3dbc420..2e6c268
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <groupId>org.apache.isis.tool</groupId>
diff --cc core/mavendeps/intellij/pom.xml
index 78e9c14,78e9c14..7a387b6
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
          <relativePath>../../pom.xml</relativePath>
      </parent>
  
diff --cc core/mavendeps/testing/pom.xml
index 3dbb626,3dbb626..6504f20
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
          <relativePath>../../pom.xml</relativePath>
      </parent>
  
diff --cc core/mavendeps/webapp/pom.xml
index aa03e2e,aa03e2e..ddeecf4
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
          <relativePath>../../pom.xml</relativePath>
      </parent>
  
diff --cc core/metamodel/pom.xml
index c2118f0,c2118f0..1bba07c
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-metamodel</artifactId>
diff --cc core/pom.xml
index 85bc9cd,18a1731a..967ff80
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
  
      <groupId>org.apache.isis.core</groupId>
      <artifactId>isis</artifactId>
--    <version>2.0.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
      
      <packaging>pom</packaging>
  
@@@ -1083,12 -1083,12 +1083,12 @@@ ${license.additional-notes
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-unittestsupport</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-unittestsupport</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
@@@ -1097,14 -1097,14 +1097,14 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-applib</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>jar</type>
                  <scope>compile</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-applib</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
@@@ -1113,14 -1113,14 +1113,14 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-schema</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>jar</type>
                  <scope>compile</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-schema</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
@@@ -1129,7 -1129,7 +1129,7 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-log4j</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>jar</type>
                  <scope>compile</scope>
              </dependency>
@@@ -1138,14 -1138,14 +1138,14 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-metamodel</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>jar</type>
                  <scope>compile</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-metamodel</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
@@@ -1154,76 -1154,76 +1154,76 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-runtime</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-runtime</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-wrapper</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              <!-- webserver -->
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-webserver</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              <!-- specsupport -->
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-specsupport</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              <!-- integtestsupport -->
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-integtestsupport</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              <!-- Restful Objects viewer -->
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>test-jar</type>
                  <scope>test</scope>
              </dependency>
@@@ -1232,12 -1232,12 +1232,12 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-security</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-security-shiro</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              
@@@ -1245,41 -1245,41 +1245,41 @@@
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-applib</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-model</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-model</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <scope>test</scope>
                  <type>test-jar</type>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-ui</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-ui</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <scope>test</scope>
                  <type>test-jar</type>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-impl</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.core</groupId>
                  <artifactId>isis-core-viewer-wicket-impl</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <scope>test</scope>
                  <type>test-jar</type>
              </dependency>
@@@ -1288,26 -1288,26 +1288,26 @@@
              <dependency>
                  <groupId>org.apache.isis.tool</groupId>
                  <artifactId>isis-maven-plugin</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
              </dependency>
  
              <!-- Maven dependencies -->
              <dependency>
                  <groupId>org.apache.isis.mavendeps</groupId>
                  <artifactId>isis-mavendeps-intellij</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>pom</type>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.mavendeps</groupId>
                  <artifactId>isis-mavendeps-testing</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>pom</type>
              </dependency>
              <dependency>
                  <groupId>org.apache.isis.mavendeps</groupId>
                  <artifactId>isis-mavendeps-webapp</artifactId>
--                <version>2.0.0-SNAPSHOT</version>
++                <version>2.0.0-M1-SNAPSHOT</version>
                  <type>pom</type>
              </dependency>
  
diff --cc core/runtime/pom.xml
index efe21b2,efe21b2..31224d4
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-runtime</artifactId>
diff --cc core/schema/pom.xml
index d106119,d106119..26c3e4f
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-schema</artifactId>
diff --cc core/security-shiro/pom.xml
index a2c6c5b,a2c6c5b..dfaecd6
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@@ -23,12 -23,12 +23,12 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<groupId>org.apache.isis.core</groupId>
  	<artifactId>isis-core-security-shiro</artifactId>
--    <version>2.0.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
  
  	<name>Apache Isis Security Shiro</name>
  
@@@ -65,7 -65,7 +65,7 @@@
  			<dependency>
  			    <groupId>org.apache.isis.core</groupId>
  			    <artifactId>isis-core-security-shiro</artifactId>
--				<version>2.0.0-SNAPSHOT</version>
++				<version>2.0.0-M1-SNAPSHOT</version>
  			</dependency>
      	</dependencies>
      </dependencyManagement>
diff --cc core/security/pom.xml
index 820920b,820920b..cb2c6b9
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-security</artifactId>
diff --cc core/specsupport/pom.xml
index 11e0279,11e0279..436489c
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@@ -15,7 -15,7 +15,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-specsupport</artifactId>
diff --cc core/unittestsupport/pom.xml
index 8d09993,8d09993..6f8c59b
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-unittestsupport</artifactId>
diff --cc core/viewer-restfulobjects-applib/pom.xml
index a33d93b,a33d93b..3994232
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
  	<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
diff --cc core/viewer-restfulobjects-rendering/pom.xml
index e0afef1,e0afef1..ca3edab
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
diff --cc core/viewer-restfulobjects-server/pom.xml
index a7d6e46,a7d6e46..8eb6d83
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
diff --cc core/viewer-wicket-applib/pom.xml
index 47c6fa0,47c6fa0..914e2e0
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--		<version>2.0.0-SNAPSHOT</version>
++		<version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <groupId>org.apache.isis.core</groupId>
diff --cc core/viewer-wicket-impl/pom.xml
index d012f16,d012f16..2781a61
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--		<version>2.0.0-SNAPSHOT</version>
++		<version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<name>Apache Isis Wicket Viewer Implementation</name>
diff --cc core/viewer-wicket-model/pom.xml
index 5eddfd6,5eddfd6..c8151f8
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--		<version>2.0.0-SNAPSHOT</version>
++		<version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-viewer-wicket-model</artifactId>
diff --cc core/viewer-wicket-ui/pom.xml
index f5fffc1,f5fffc1..3dda71b
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
  	<parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--		<version>2.0.0-SNAPSHOT</version>
++		<version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --cc core/webserver/pom.xml
index d3d3caa,d3d3caa..59a283b
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
  		<groupId>org.apache.isis.core</groupId>
  		<artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
  	<artifactId>isis-core-webserver</artifactId>
diff --cc core/wrapper/pom.xml
index 50eb805,50eb805..4a00078
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
--        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
  	</parent>
  
  	<artifactId>isis-core-wrapper</artifactId>
diff --cc example/application/helloworld/pom.xml
index e953206,e9fd6bb..b0f2ad2
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@@ -29,14 -29,14 +29,14 @@@
  
      <groupId>org.apache.isis.example.application</groupId>
      <artifactId>helloworld</artifactId>
-     <version>1.16.0-SNAPSHOT</version>
 -    <version>2.0.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
  
      <name>HelloWorld</name>
  
      <packaging>war</packaging>
  
      <properties>
-         <isis.version>1.16.0</isis.version>
 -        <isis.version>2.0.0-SNAPSHOT</isis.version>
++        <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
  
          <compiler-plugin.source>1.8</compiler-plugin.source>
          <compiler-plugin.target>1.8</compiler-plugin.target>
diff --cc example/application/simpleapp/application/pom.xml
index 6800a60,298a2f2..e46f103
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.example.application</groupId>
          <artifactId>simpleapp</artifactId>
-         <version>1.16.0-SNAPSHOT</version>
 -        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>simpleapp-application</artifactId>
diff --cc example/application/simpleapp/module-simple/pom.xml
index 0cc97ca,f4b84af..4910509
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.example.application</groupId>
          <artifactId>simpleapp</artifactId>
-         <version>1.16.0-SNAPSHOT</version>
 -        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>simpleapp-module-simple</artifactId>
diff --cc example/application/simpleapp/pom.xml
index 4a62eff,4dd98c6..84de916
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -29,15 -29,15 +29,14 @@@
  
      <groupId>org.apache.isis.example.application</groupId>
      <artifactId>simpleapp</artifactId>
-     <version>1.16.0-SNAPSHOT</version>
 -    <version>2.0.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
  
      <name>SimpleApp Parent</name>
  
      <packaging>pom</packaging>
  
      <properties>
-         <isis.version>1.16.0</isis.version>
 -        <isis.version>2.0.0-SNAPSHOT</isis.version>
--
++        <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
          <lombok.version>1.16.18</lombok.version>
  
          <compiler-plugin.source>1.8</compiler-plugin.source>
diff --cc example/application/simpleapp/webapp/pom.xml
index 953036d,db81246..da6eea8
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
      <parent>
          <groupId>org.apache.isis.example.application</groupId>
          <artifactId>simpleapp</artifactId>
-         <version>1.16.0-SNAPSHOT</version>
 -        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
      </parent>
  
      <artifactId>simpleapp-webapp</artifactId>
diff --cc example/archetype/helloworld/pom.xml
index 7fab804,f10a2c3..350cfea
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@@ -21,7 -21,7 +21,7 @@@
      <modelVersion>4.0.0</modelVersion>
      <groupId>org.apache.isis.archetype</groupId>
      <artifactId>helloworld-archetype</artifactId>
-     <version>2.0.0-SNAPSHOT</version>
 -    <version>1.16.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
      <packaging>maven-archetype</packaging>
      <name>helloworld-archetype</name>
      <build>
diff --cc example/archetype/simpleapp/pom.xml
index 91fc9ac,fccf505..a432bb2
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@@ -21,7 -21,7 +21,7 @@@
      <modelVersion>4.0.0</modelVersion>
      <groupId>org.apache.isis.archetype</groupId>
      <artifactId>simpleapp-archetype</artifactId>
-     <version>2.0.0-SNAPSHOT</version>
 -    <version>1.16.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
      <packaging>maven-archetype</packaging>
      <name>simpleapp-archetype</name>
      <build>
@@@ -70,7 -70,7 +70,7 @@@
      <parent>
          <groupId>org.apache.isis.core</groupId>
          <artifactId>isis</artifactId>
-         <version>1.16.0</version>
 -        <version>2.0.0-SNAPSHOT</version>
++        <version>2.0.0-M1-SNAPSHOT</version>
          <relativePath>../../../core/pom.xml</relativePath>
      </parent>
      <properties>
diff --cc example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
index 530165c,2851df3..d9cbb30
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
@@@ -45,20 -46,24 +45,26 @@@ public class SimpleObjects_Test 
      public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
  
      @Mock
++<<<<<<< HEAD:example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
++=======
+     ServiceRegistry mockServiceRegistry;
+     
+     @Mock
++>>>>>>> dev/2.0.0-M1:example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java
      RepositoryService mockRepositoryService;
  
 -    SimpleObjectRepository simpleObjectRepository;
 +    SimpleObjects simpleObjects;
  
      @Before
 -    public void setUp() throws Exception {
 -        simpleObjectRepository = new SimpleObjectRepository();
 -        simpleObjectRepository.repositoryService = mockRepositoryService;
 -        simpleObjectRepository.serviceRegistry = mockServiceRegistry;
 +    public void setUp() {
 +        simpleObjects = new SimpleObjects();
 +        simpleObjects.repositoryService = mockRepositoryService;
      }
  
 -    public static class Create extends SimpleObjectRepository_Test {
 +    public static class Create extends SimpleObjects_Test {
  
          @Test
 -        public void happyCase() throws Exception {
 +        public void happyCase() {
  
              final String someName = "Foobar";
  
diff --cc pom.xml
index 234d064,d973293..b376ff4
--- a/pom.xml
+++ b/pom.xml
@@@ -21,7 -21,7 +21,7 @@@
  
      <groupId>org.apache.isis</groupId>
      <artifactId>isis-all</artifactId>
-     <version>1.0.0-SNAPSHOT</version>
 -    <version>2.0.0-SNAPSHOT</version>
++    <version>2.0.0-M1-SNAPSHOT</version>
  
      <packaging>pom</packaging>
  

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.