You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/01/10 10:31:27 UTC
[isis] branch master updated: ISIS-2939: revert java sources
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c091e9f ISIS-2939: revert java sources
c091e9f is described below
commit c091e9f11d0edb04c6d8e8668b9ff6eef5b09423
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 10 11:28:43 2022 +0100
ISIS-2939: revert java sources
---
.../java/org/apache/isis/applib/ViewModel.java | 2 +-
.../applib/{annotations => annotation}/Action.java | 2 +-
.../{annotations => annotation}/ActionLayout.java | 6 +-
.../BookmarkPolicy.java | 2 +-
.../{annotations => annotation}/Bounding.java | 2 +-
.../{annotations => annotation}/Collection.java | 2 +-
.../CollectionLayout.java | 2 +-
.../applib/{annotations => annotation}/Domain.java | 2 +-
.../{annotations => annotation}/DomainObject.java | 4 +-
.../DomainObjectLayout.java | 2 +-
.../{annotations => annotation}/DomainService.java | 2 +-
.../DomainServiceLayout.java | 2 +-
.../{annotations => annotation}/Editing.java | 2 +-
.../EntityChangeKind.java | 2 +-
.../{annotations => annotation}/HomePage.java | 2 +-
.../InteractionScope.java | 2 +-
.../{annotations => annotation}/Introspection.java | 2 +-
.../{annotations => annotation}/LabelPosition.java | 6 +-
.../LogicalTypeName.java | 2 +-
.../{annotations => annotation}/MemberSupport.java | 2 +-
.../{annotations => annotation}/MinLength.java | 2 +-
.../applib/{annotations => annotation}/Module.java | 2 +-
.../applib/{annotations => annotation}/Nature.java | 2 +-
.../NatureOfService.java | 2 +-
.../{annotations => annotation}/Navigable.java | 2 +-
.../ObjectLifecycle.java | 2 +-
.../{annotations => annotation}/ObjectSupport.java | 2 +-
.../{annotations => annotation}/Optionality.java | 2 +-
.../{annotations => annotation}/Parameter.java | 4 +-
.../ParameterLayout.java | 2 +-
.../PriorityPrecedence.java | 2 +-
.../{annotations => annotation}/Programmatic.java | 2 +-
.../{annotations => annotation}/Projecting.java | 2 +-
.../{annotations => annotation}/PromptStyle.java | 2 +-
.../{annotations => annotation}/Property.java | 2 +-
.../PropertyLayout.java | 4 +-
.../{annotations => annotation}/Publishing.java | 2 +-
.../{annotations => annotation}/Redirect.java | 2 +-
.../{annotations => annotation}/RenderDay.java | 2 +-
.../{annotations => annotation}/Repainting.java | 2 +-
.../{annotations => annotation}/RestrictTo.java | 2 +-
.../{annotations => annotation}/SemanticsOf.java | 2 +-
.../{annotations => annotation}/Snapshot.java | 2 +-
.../{annotations => annotation}/TimePrecision.java | 2 +-
.../applib/{annotations => annotation}/Title.java | 2 +-
.../applib/{annotations => annotation}/Value.java | 2 +-
.../ValueSemantics.java | 2 +-
.../applib/{annotations => annotation}/Where.java | 2 +-
.../{annotations => annotation}/package-info.java | 2 +-
.../isis/applib/domain/DomainObjectList.java | 16 ++--
.../applib/events/domain/ActionDomainEvent.java | 6 +-
.../events/domain/CollectionDomainEvent.java | 2 +-
.../applib/events/domain/PropertyDomainEvent.java | 2 +-
.../events/lifecycle/ObjectCreatedEvent.java | 2 +-
.../applib/events/lifecycle/ObjectLoadedEvent.java | 2 +-
.../events/lifecycle/ObjectPersistedEvent.java | 2 +-
.../events/lifecycle/ObjectPersistingEvent.java | 2 +-
.../events/lifecycle/ObjectRemovingEvent.java | 2 +-
.../events/lifecycle/ObjectUpdatedEvent.java | 2 +-
.../events/lifecycle/ObjectUpdatingEvent.java | 2 +-
.../isis/applib/events/ui/CssClassUiEvent.java | 4 +-
.../apache/isis/applib/events/ui/IconUiEvent.java | 2 +-
.../isis/applib/events/ui/LayoutUiEvent.java | 2 +-
.../apache/isis/applib/events/ui/TitleUiEvent.java | 2 +-
.../org/apache/isis/applib/graph/SimpleEdge.java | 2 +-
.../apache/isis/applib/graph/tree/TreeNode.java | 4 +-
.../org/apache/isis/applib/id/LogicalType.java | 2 +-
.../applib/layout/component/ActionLayoutData.java | 16 ++--
.../layout/component/CollectionLayoutData.java | 4 +-
.../layout/component/DomainObjectLayoutData.java | 4 +-
.../isis/applib/layout/component/FieldSet.java | 2 +-
.../applib/layout/component/HasBookmarking.java | 2 +-
.../isis/applib/layout/component/HasHidden.java | 2 +-
.../layout/component/PropertyLayoutData.java | 10 +--
.../layout/component/ServiceActionLayoutData.java | 4 +-
.../org/apache/isis/applib/layout/grid/Grid.java | 2 +-
.../isis/applib/layout/grid/GridAbstract.java | 2 +-
.../applib/layout/grid/bootstrap3/BS3Grid.java | 2 +-
.../isis/applib/layout/grid/bootstrap3/BS3Row.java | 2 +-
.../layout/grid/bootstrap3/BS3RowContent.java | 2 +-
.../isis/applib/layout/grid/bootstrap3/BS3Tab.java | 2 +-
.../applib/layout/grid/bootstrap3/BS3TabGroup.java | 2 +-
.../applib/layout/grid/bootstrap3/WithinGrid.java | 2 +-
.../isis/applib/layout/menubars/HasNamed.java | 2 +-
.../isis/applib/layout/menubars/MenuBars.java | 2 +-
.../applib/layout/menubars/MenuBarsAbstract.java | 2 +-
.../isis/applib/layout/menubars/MenuSection.java | 2 +-
.../applib/layout/menubars/bootstrap3/BS3Menu.java | 2 +-
.../layout/menubars/bootstrap3/BS3MenuBar.java | 4 +-
.../layout/menubars/bootstrap3/BS3MenuBars.java | 4 +-
.../org/apache/isis/applib/locale/UserLocale.java | 2 +-
.../isis/applib/mixins/dto/Dto_downloadXml.java | 12 +--
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 12 +--
.../mixins/layout/Object_downloadLayoutXml.java | 14 ++--
.../metamodel/Object_downloadMetamodelXml.java | 14 ++--
.../mixins/metamodel/Object_logicalTypeName.java | 12 +--
.../mixins/metamodel/Object_objectIdentifier.java | 12 +--
.../mixins/metamodel/Object_rebuildMetamodel.java | 12 +--
.../applib/mixins/rest/Object_openRestApi.java | 12 +--
.../applib/mixins/system/DomainChangeRecord.java | 8 +-
.../DomainChangeRecord_openTargetObject.java | 8 +-
.../services/appfeat/ApplicationFeature.java | 4 +-
.../services/appfeat/ApplicationFeatureId.java | 4 +-
.../services/appfeat/ApplicationFeatureSort.java | 2 +-
.../services/appfeatui/ApplicationFeatureMenu.java | 18 ++---
.../appfeatui/ApplicationFeatureViewModel.java | 20 ++---
.../services/appfeatui/ApplicationNamespace.java | 10 +--
.../applib/services/appfeatui/ApplicationType.java | 10 +--
.../services/appfeatui/ApplicationTypeAction.java | 10 +--
.../appfeatui/ApplicationTypeCollection.java | 8 +-
.../services/appfeatui/ApplicationTypeMember.java | 10 +--
.../appfeatui/ApplicationTypeProperty.java | 12 +--
.../isis/applib/services/bookmark/Bookmark.java | 2 +-
.../services/bookmark/BookmarkHolder_lookup.java | 6 +-
.../services/bookmark/BookmarkHolder_object.java | 2 +-
.../isis/applib/services/clock/ClockService.java | 2 +-
.../conmap/ContentMappingServiceForCommandDto.java | 2 +-
.../ContentMappingServiceForCommandsDto.java | 2 +-
.../processor/spi/CommandDtoProcessorService.java | 4 +-
.../spi/CommandDtoProcessorServiceIdentity.java | 2 +-
.../services/confview/ConfigurationMenu.java | 16 ++--
.../services/confview/ConfigurationProperty.java | 8 +-
.../services/confview/ConfigurationViewmodel.java | 8 +-
.../isis/applib/services/grid/GridService.java | 8 +-
.../applib/services/grid/GridSystemService.java | 12 +--
.../services/homepage/HomePageResolverService.java | 2 +-
.../applib/services/homepage/package-info.java | 2 +-
.../applib/services/i18n/TranslatableString.java | 2 +-
.../isis/applib/services/jaxb/IsisSchemas.java | 2 +-
.../applib/services/layout/LayoutServiceMenu.java | 18 ++---
.../apache/isis/applib/services/layout/Style.java | 4 +-
.../isis/applib/services/menu/MenuBarsService.java | 2 +-
.../isis/applib/services/metamodel/BeanSort.java | 2 +-
.../services/metamodel/MetaModelService.java | 6 +-
.../services/metamodel/MetaModelServiceMenu.java | 24 +++---
.../applib/services/metrics/MetricsService.java | 2 +-
.../services/publishing/log/CommandLogger.java | 2 +-
.../publishing/log/EntityChangesLogger.java | 2 +-
.../publishing/log/EntityPropertyChangeLogger.java | 2 +-
.../services/publishing/log/ExecutionLogger.java | 2 +-
.../publishing/spi/EntityChangesSubscriber.java | 2 +-
.../spi/EntityPropertyChangeSubscriber.java | 2 +-
.../publishing/spi/ExecutionSubscriber.java | 4 +-
.../queryresultscache/QueryResultsCache.java | 4 +-
.../registry/InstanceByPriorityComparator.java | 2 +-
.../applib/services/routing/RoutingService.java | 2 +-
.../session/SessionLoggingServiceLogging.java | 2 +-
.../services/sitemap/SitemapServiceMenu.java | 20 ++---
.../isis/applib/services/sudo/SudoService.java | 2 +-
.../isis/applib/services/swagger/Format.java | 2 +-
.../isis/applib/services/swagger/Visibility.java | 4 +-
.../isis/applib/services/user/ImpersonateMenu.java | 20 ++---
.../applib/services/user/ImpersonateStopMenu.java | 22 +++---
.../isis/applib/services/user/RoleMemento.java | 10 +--
.../isis/applib/services/user/UserMemento.java | 22 +++---
.../isis/applib/services/user/UserService.java | 2 +-
.../isis/applib/services/userui/UserMenu.java | 16 ++--
.../isis/applib/spec/AbstractSpecification.java | 2 +-
.../isis/applib/spec/AbstractSpecification2.java | 2 +-
.../org/apache/isis/applib/spec/Specification.java | 2 +-
.../apache/isis/applib/spec/Specification2.java | 2 +-
.../apache/isis/applib/spec/SpecificationAnd.java | 2 +-
.../apache/isis/applib/spec/SpecificationNot.java | 2 +-
.../apache/isis/applib/spec/SpecificationOr.java | 2 +-
.../org/apache/isis/applib/spec/package-info.java | 6 +-
.../org/apache/isis/applib/util/TitleBuffer.java | 20 ++---
.../org/apache/isis/applib/util/package-info.java | 4 +-
.../java/org/apache/isis/applib/value/Blob.java | 2 +-
.../java/org/apache/isis/applib/value/Clob.java | 2 +-
.../isis/applib/value/LocalResourcePath.java | 2 +-
.../java/org/apache/isis/applib/value/Markup.java | 2 +-
.../org/apache/isis/applib/value/Password.java | 2 +-
.../org/apache/isis/applib/value/package-info.java | 2 +-
.../value/semantics/TemporalValueSemantics.java | 2 +-
.../value/semantics/ValueSemanticsAbstract.java | 2 +-
.../value/semantics/ValueSemanticsProvider.java | 2 +-
.../isis/applib/value/semantics/package-info.java | 2 +-
.../commons/internal/reflection/ReflectTest.java | 2 +-
.../component/PropertyLayoutData_repaint_Test.java | 2 +-
.../org/apache/isis/applib/util/EnumsTest.java | 2 +-
.../apache/isis/core/config/IsisConfiguration.java | 88 +++++++++++-----------
.../IsisBeanFactoryPostProcessorForSpring.java | 4 +-
.../beans/IsisBeanTypeClassifierDefault.java | 6 +-
.../config/beans/IsisBeanTypeRegistryDefault.java | 2 +-
.../DataSourceIntrospectionService.java | 2 +-
.../progmodel/ProgrammingModelConstants.java | 8 +-
.../core/config/viewer/web/WebAppContextPath.java | 2 +-
...teractionAwareTransactionalBoundaryHandler.java | 2 +-
.../core/metamodel/context/MetaModelContext.java | 2 +-
.../isis/core/metamodel/facets/FacetFactory.java | 2 +-
.../metamodel/facets/ObjectTypeFacetFactory.java | 2 +-
.../core/metamodel/facets/WhereValueFacet.java | 2 +-
.../metamodel/facets/WhereValueFacetAbstract.java | 2 +-
.../facets/actcoll/typeof/TypeOfFacet.java | 2 +-
.../action/ActionAnnotationFacetFactory.java | 2 +-
.../ActionExplicitFacetForActionAnnotation.java | 2 +-
.../hidden/HiddenFacetForActionAnnotation.java | 4 +-
.../PrototypeFacetForActionAnnotation.java | 4 +-
...ctionSemanticsFacetFallbackToNonIdempotent.java | 2 +-
.../ActionSemanticsFacetForActionAnnotation.java | 4 +-
.../typeof/TypeOfFacetForActionAnnotation.java | 2 +-
.../ContributingFacetFromMixinFacetFactory.java | 4 +-
.../FileAcceptFacetForActionAnnotation.java | 2 +-
.../annotation/HomePageFacetAnnotationFactory.java | 2 +-
.../actions/layout/ActionLayoutFacetFactory.java | 2 +-
...tionPositionFacetForActionLayoutAnnotation.java | 2 +-
.../layout/ActionPositionFacetForActionXml.java | 4 +-
...okmarkPolicyFacetForActionLayoutAnnotation.java | 4 +-
.../layout/BookmarkPolicyFacetForActionXml.java | 2 +-
.../CssClassFaFacetForActionLayoutAnnotation.java | 2 +-
.../CssClassFacetForActionLayoutAnnotation.java | 2 +-
.../HiddenFacetForActionLayoutAnnotation.java | 4 +-
.../actions/layout/HiddenFacetForActionXml.java | 2 +-
...berDescribedFacetForActionLayoutAnnotation.java | 2 +-
.../NamedFacetForActionLayoutAnnotation.java | 2 +-
.../PromptStyleFacetForActionLayoutAnnotation.java | 4 +-
.../layout/PromptStyleFacetForActionXml.java | 2 +-
.../RedirectFacetFromActionLayoutAnnotation.java | 4 +-
.../actions/layout/RedirectFacetFromActionXml.java | 2 +-
...otInServiceMenuFacetFromDomainServiceFacet.java | 2 +-
...viceMenuFacetFromDomainServiceFacetFactory.java | 2 +-
.../actions/position/ActionPositionFacet.java | 2 +-
.../position/ActionPositionFacetAbstract.java | 2 +-
.../position/ActionPositionFacetFallback.java | 2 +-
.../facets/actions/redirect/RedirectFacet.java | 2 +-
.../actions/redirect/RedirectFacetAbstract.java | 2 +-
.../actions/redirect/RedirectFacetFallback.java | 2 +-
.../actions/semantics/ActionSemanticsFacet.java | 2 +-
.../semantics/ActionSemanticsFacetAbstract.java | 2 +-
.../CollectionAnnotationFacetFactory.java | 4 +-
.../hidden/HiddenFacetForCollectionAnnotation.java | 4 +-
...ionDomainEventFacetForCollectionAnnotation.java | 2 +-
.../typeof/TypeOfFacetForCollectionAnnotation.java | 2 +-
.../layout/CollectionLayoutFacetFactory.java | 2 +-
...CssClassFacetForCollectionLayoutAnnotation.java | 2 +-
...aultViewFacetForCollectionLayoutAnnotation.java | 2 +-
.../HiddenFacetForCollectionLayoutAnnotation.java | 4 +-
.../layout/HiddenFacetForCollectionXml.java | 2 +-
...escribedFacetForCollectionLayoutAnnotation.java | 2 +-
...berNamedFacetForCollectionLayoutAnnotation.java | 2 +-
.../PagedFacetForCollectionLayoutAnnotation.java | 2 +-
...SortedByFacetForCollectionLayoutAnnotation.java | 2 +-
.../facets/fallback/FallbackFacetFactory.java | 2 +-
.../LabelAtFacetFromLayoutConfiguration.java | 2 +-
.../facets/members/cssclassfa/CssClassFaFacet.java | 2 +-
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 2 +-
.../members/disabled/DisabledFacetAbstract.java | 2 +-
.../disabled/DisabledFacetForContributee.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 2 +-
.../HiddenFacetAbstractAlwaysEverywhere.java | 2 +-
.../members/hidden/HiddenFacetAbstractImpl.java | 2 +-
.../HiddenFacetFromLayoutPropertiesAbstract.java | 2 +-
.../members/layout/group/GroupIdAndName.java | 6 +-
.../members/layout/group/LayoutGroupFacet.java | 6 +-
.../LayoutGroupFacetFromActionAnnotation.java | 2 +-
...LayoutGroupFacetFromActionLayoutAnnotation.java | 2 +-
...youtGroupFacetFromPropertyLayoutAnnotation.java | 2 +-
.../members/layout/order/LayoutOrderFacet.java | 6 +-
...LayoutOrderFacetFromActionLayoutAnnotation.java | 2 +-
...utOrderFacetFromCollectionLayoutAnnotation.java | 2 +-
...youtOrderFacetFromPropertyLayoutAnnotation.java | 2 +-
.../CommandPublishingFacetForActionAnnotation.java | 4 +-
...ommandPublishingFacetForPropertyAnnotation.java | 4 +-
...onPublishingActionFacetForActionAnnotation.java | 4 +-
...blishingPropertyFacetForPropertyAnnotation.java | 4 +-
.../ViewModelSemanticCheckingFacetFactory.java | 6 +-
.../object/bookmarkpolicy/BookmarkPolicyFacet.java | 6 +-
.../BookmarkPolicyFacetAbstract.java | 2 +-
.../BookmarkPolicyFacetFallback.java | 2 +-
.../BookmarkPolicyFacetFallbackFactory.java | 2 +-
.../callbacks/CreatedLifecycleEventFacet.java | 2 +-
.../callbacks/LoadedLifecycleEventFacet.java | 2 +-
.../callbacks/PersistedLifecycleEventFacet.java | 2 +-
.../callbacks/PersistingLifecycleEventFacet.java | 2 +-
.../callbacks/RemovingLifecycleEventFacet.java | 2 +-
.../callbacks/UpdatedLifecycleEventFacet.java | 2 +-
.../callbacks/UpdatingLifecycleEventFacet.java | 2 +-
.../choices/ChoicesFacetFromBoundedAbstract.java | 2 +-
...ssClassFaFacetForDomainObjectLayoutFactory.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 12 +--
.../ChoicesFacetForDomainObjectAnnotation.java | 4 +-
...itingEnabledFacetForDomainObjectAnnotation.java | 4 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 2 +-
...gePublishingFacetForDomainObjectAnnotation.java | 2 +-
...tityChangePublishingFacetFromConfiguration.java | 2 +-
...ectionPolicyFacetForDomainObjectAnnotation.java | 4 +-
.../LogicalTypeFacetForDomainObjectAnnotation.java | 2 +-
...gicalTypeFacetForLogicalTypeNameAnnotation.java | 2 +-
...etForLogicalTypeNameAnnotationFacetFactory.java | 2 +-
...atableObjectFacetForDomainObjectAnnotation.java | 2 +-
...PolicyFacetForDomainObjectLayoutAnnotation.java | 4 +-
.../BookmarkPolicyFacetForDomainObjectXml.java | 2 +-
...lassFaFacetForDomainObjectLayoutAnnotation.java | 2 +-
...sClassFacetForDomainObjectLayoutAnnotation.java | 2 +-
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...ibedAsFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../DomainObjectLayoutFacetFactory.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 2 +-
.../NamedFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../PagedFacetForDomainObjectLayoutAnnotation.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../object/domainservice/DomainServiceFacet.java | 6 +-
.../domainservice/DomainServiceFacetAbstract.java | 2 +-
.../annotation/DomainServiceFacetAnnotation.java | 2 +-
.../DomainServiceFacetAnnotationFactory.java | 2 +-
.../DomainServiceLayoutFacet.java | 6 +-
.../DomainServiceLayoutFacetAbstract.java | 2 +-
.../DomainServiceLayoutFacetFactory.java | 4 +-
...NamedFacetForDomainServiceLayoutAnnotation.java | 2 +-
.../DomainServiceLayoutFacetAnnotation.java | 2 +-
.../RemoveAnnotatedMethodsFacetFactory.java | 2 +-
.../ignore/javalang/RemoveMethodsFacetFactory.java | 2 +-
.../introspection/IntrospectionPolicyFacet.java | 8 +-
.../IntrospectionPolicyFacetAbstract.java | 2 +-
.../object/logicaltype/LogicalTypeFacet.java | 2 +-
.../metamodel/facets/object/mixin/MixinFacet.java | 10 +--
.../mixin/MixinFacetForDomainObjectAnnotation.java | 4 +-
.../NavigableParentAnnotationFacetFactory.java | 2 +-
.../impl/ObjectValidPropertiesFacetImpl.java | 2 +-
.../ProjectionFacetFromProjectingProperty.java | 2 +-
.../object/promptStyle/PromptStyleFacet.java | 2 +-
.../promptStyle/PromptStyleFacetAsConfigured.java | 2 +-
.../annotation/TitleAnnotationFacetFactory.java | 2 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 2 +-
...ionOrAnyMatchingValueSemanticsFacetFactory.java | 2 +-
.../facets/object/viewmodel/ViewModelFacet.java | 4 +-
.../daterenderedadjust/DateRenderAdjustFacet.java | 2 +-
.../digits/MaxFractionalDigitsFacet.java | 2 +-
.../objectvalue/digits/MaxTotalDigitsFacet.java | 2 +-
.../digits/MinFractionalDigitsFacet.java | 2 +-
.../objectvalue/digits/MinIntegerDigitsFacet.java | 2 +-
.../facets/objectvalue/labelat/LabelAtFacet.java | 6 +-
.../objectvalue/labelat/LabelAtFacetAbstract.java | 2 +-
.../labelat/LabelAtFacetFromMultiLineFacet.java | 4 +-
.../temporalformat/DateFormatStyleFacet.java | 2 +-
.../temporalformat/TimeFormatPrecisionFacet.java | 4 +-
.../TimeFormatPrecisionFacetAbstract.java | 2 +-
.../temporalformat/TimeFormatStyleFacet.java | 2 +-
.../ValueSemanticsSelectingFacet.java | 8 +-
.../facets/param/autocomplete/MinLengthUtil.java | 2 +-
.../CssClassFacetForParameterLayoutAnnotation.java | 2 +-
...scribedAsFacetForParameterLayoutAnnotation.java | 2 +-
.../LabelAtFacetForParameterLayoutAnnotation.java | 4 +-
...MultiLineFacetForParameterLayoutAnnotation.java | 2 +-
.../NamedFacetForParameterLayoutAnnotation.java | 2 +-
.../param/layout/ParameterLayoutFacetFactory.java | 2 +-
...dAdjustedFacetForParameterLayoutAnnotation.java | 4 +-
...calLengthFacetForParameterLayoutAnnotation.java | 2 +-
.../parameter/ParameterAnnotationFacetFactory.java | 2 +-
.../FileAcceptFacetForParameterAnnotation.java | 2 +-
.../MandatoryFacetForParameterAnnotation.java | 4 +-
.../MaxLengthFacetForParameterAnnotation.java | 2 +-
...fySpecificationFacetForParameterAnnotation.java | 2 +-
.../regex/RegExFacetForParameterAnnotation.java | 2 +-
.../DisabledFacetOnPropertyFromImmutable.java | 2 +-
.../DisabledFacetOnPropertyFromMissingSetter.java | 2 +-
.../properties/projection/ProjectingFacet.java | 2 +-
.../ProjectingFacetFromPropertyAnnotation.java | 4 +-
.../property/PropertyAnnotationFacetFactory.java | 4 +-
.../DisabledFacetForPropertyAnnotation.java | 6 +-
...acetForPropertyAnnotationInvertedSemantics.java | 2 +-
.../EntityPropertyChangePublishingPolicyFacet.java | 2 +-
...ropertyChangePublishingPolicyFacetAbstract.java | 2 +-
...PublishingPolicyFacetForPropertyAnnotation.java | 4 +-
.../FileAcceptFacetForPropertyAnnotation.java | 2 +-
.../hidden/HiddenFacetForPropertyAnnotation.java | 4 +-
.../MandatoryFacetForPropertyAnnotation.java | 4 +-
.../MaxLengthFacetForPropertyAnnotation.java | 2 +-
.../modify/PropertyDomainEventFacetAbstract.java | 2 +-
...sfySpecificationFacetForPropertyAnnotation.java | 2 +-
.../regex/RegExFacetForPropertyAnnotation.java | 2 +-
.../SnapshotExcludeFacetForPropertyAnnotation.java | 4 +-
.../CssClassFacetForPropertyLayoutAnnotation.java | 2 +-
...escribedAsFacetForPropertyLayoutAnnotation.java | 2 +-
.../HiddenFacetForPropertyLayoutAnnotation.java | 4 +-
.../propertylayout/HiddenFacetForPropertyXml.java | 2 +-
.../LabelAtFacetForPropertyLayoutAnnotation.java | 4 +-
.../propertylayout/LabelAtFacetForPropertyXml.java | 2 +-
.../MultiLineFacetForPropertyLayoutAnnotation.java | 2 +-
.../NamedFacetForPropertyLayoutAnnotation.java | 2 +-
...romptStyleFacetForPropertyLayoutAnnotation.java | 4 +-
.../PromptStyleFacetForPropertyXml.java | 2 +-
.../propertylayout/PropertyLayoutFacetFactory.java | 2 +-
...edAdjustedFacetForPropertyLayoutAnnotation.java | 4 +-
...icalLengthFacetForPropertyLayoutAnnotation.java | 2 +-
...UnchangingFacetForPropertyLayoutAnnotation.java | 4 +-
.../UnchangingFacetForPropertyXml.java | 2 +-
.../LogicalTypeFacetForValueAnnotation.java | 2 +-
.../annotation/ValueAnnotationFacetFactory.java | 2 +-
...rmatStyleFacetFromValueSemanticsAnnotation.java | 2 +-
...derAdjustFacetFromValueSemanticsAnnotation.java | 2 +-
...nalDigitsFacetFromValueSemanticsAnnotation.java | 2 +-
...talDigitsFacetFromValueSemanticsAnnotation.java | 2 +-
...nalDigitsFacetFromValueSemanticsAnnotation.java | 2 +-
...gerDigitsFacetFromValueSemanticsAnnotation.java | 2 +-
...PrecisionFacetFromValueSemanticsAnnotation.java | 4 +-
...rmatStyleFacetFromValueSemanticsAnnotation.java | 2 +-
.../ValueSemanticsAnnotationFacetFactory.java | 2 +-
.../ValueSemanticsSelectingFacetForAnnotation.java | 2 +-
.../metamodel/inspect/Object_inspectMetamodel.java | 12 +--
.../core/metamodel/inspect/model/ActionNode.java | 8 +-
.../metamodel/inspect/model/CollectionNode.java | 8 +-
.../metamodel/inspect/model/FacetAttrNode.java | 8 +-
.../metamodel/inspect/model/FacetGroupNode.java | 8 +-
.../core/metamodel/inspect/model/FacetNode.java | 8 +-
.../isis/core/metamodel/inspect/model/MMNode.java | 10 +--
.../metamodel/inspect/model/ParameterNode.java | 8 +-
.../core/metamodel/inspect/model/PropertyNode.java | 8 +-
.../core/metamodel/inspect/model/TypeNode.java | 8 +-
.../core/metamodel/interactions/AccessContext.java | 2 +-
.../interactions/ActionArgUsabilityContext.java | 2 +-
.../interactions/ActionArgVisibilityContext.java | 2 +-
.../interactions/ActionUsabilityContext.java | 2 +-
.../interactions/ActionVisibilityContext.java | 2 +-
.../interactions/CollectionUsabilityContext.java | 2 +-
.../interactions/CollectionVisibilityContext.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 2 +-
.../interactions/ObjectVisibilityContext.java | 2 +-
.../interactions/PropertyUsabilityContext.java | 2 +-
.../interactions/PropertyVisibilityContext.java | 2 +-
.../metamodel/interactions/UsabilityContext.java | 2 +-
.../metamodel/interactions/ValidityContext.java | 2 +-
.../metamodel/interactions/VisibilityContext.java | 2 +-
.../interactions/managed/ActionInteraction.java | 2 +-
.../managed/CollectionInteraction.java | 2 +-
.../interactions/managed/ManagedAction.java | 2 +-
.../interactions/managed/ManagedCollection.java | 2 +-
.../interactions/managed/ManagedMember.java | 2 +-
.../interactions/managed/ManagedProperty.java | 2 +-
.../interactions/managed/PropertyInteraction.java | 2 +-
.../managed/nonscalar/DataTableModel.java | 2 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 8 +-
...tionEnforcesMetamodelContributionValidator.java | 4 +-
.../isis/core/metamodel/methods/MethodFinder.java | 6 +-
.../objectmanager/ObjectManagerDefault.java | 2 +-
.../TweakDomainEventsForMixinPostProcessor.java | 4 +-
.../metamodel/services/ServiceInjectorDefault.java | 2 +-
.../appfeat/ApplicationFeatureDefault.java | 4 +-
.../ApplicationFeatureRepositoryDefault.java | 4 +-
.../classsubstitutor/ClassSubstitutorAbstract.java | 2 +-
.../classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../ClassSubstitutorForCollections.java | 2 +-
.../ClassSubstitutorForDomainObjects.java | 2 +-
.../classsubstitutor/ClassSubstitutorRegistry.java | 2 +-
.../services/events/MetamodelEventService.java | 2 +-
...ExceptionRecognizerForRecoverableException.java | 2 +-
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../services/grid/GridReaderUsingJaxb.java | 2 +-
.../services/grid/GridServiceDefault.java | 2 +-
.../services/grid/GridSystemServiceAbstract.java | 14 ++--
.../bootstrap3/GridSystemServiceBootstrap.java | 4 +-
.../metamodel/services/homepage/package-info.java | 2 +-
.../services/layout/LayoutServiceDefault.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 2 +-
.../services/publishing/ExecutionPublisher.java | 4 +-
.../services/registry/ServiceRegistryDefault.java | 2 +-
.../tablecol/TableColumnOrderServiceDefault.java | 2 +-
.../TableColumnOrderServiceUsingTxtFile.java | 4 +-
.../services/title/TitleServiceDefault.java | 2 +-
.../isis/core/metamodel/spec/ManagedObjects.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 8 +-
.../metamodel/spec/feature/ObjectAssociation.java | 2 +-
.../core/metamodel/spec/feature/ObjectMember.java | 2 +-
.../metamodel/specloader/LogicalTypeResolver.java | 2 +-
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specloader/facetprocessor/FacetProcessor.java | 2 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 8 +-
.../specloader/specimpl/ObjectActionDefault.java | 8 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 6 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specimpl/OneToManyAssociationDefault.java | 6 +-
.../specimpl/OneToManyAssociationMixedIn.java | 4 +-
.../specimpl/OneToOneAssociationDefault.java | 6 +-
.../specimpl/OneToOneAssociationMixedIn.java | 4 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../specimpl/dflt/_PropertiesAsColumns.java | 2 +-
.../valuesemantics/EnumValueSemanticsAbstract.java | 2 +-
.../temporal/TemporalValueSemanticsProvider.java | 2 +-
.../valuetypes/ValueSemanticsResolverDefault.java | 4 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../Annotations_getAnnotations_on_Field_Test.java | 4 +-
...nnotationFacetFactoryTest_ActionInvocation.java | 2 +-
.../ActionAnnotationFacetFactoryTest_Hidden.java | 4 +-
...ctionAnnotationFacetFactoryTest_Invocation.java | 2 +-
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 6 +-
...ActionAnnotationFacetFactoryTest_Semantics.java | 4 +-
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 2 +-
...notationFacetFactoryTest_commandPublishing.java | 4 +-
...tationFacetFactoryTest_executionPublishing.java | 18 ++---
...icsFacetFallbackToNonIdempotentFactoryTest.java | 2 +-
.../PrototypeFacetAnnotationFactoryTest.java | 4 +-
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 2 +-
...MenuFacetFromDomainServiceFacetFactoryTest.java | 4 +-
.../CollectionAnnotationFacetFactoryTest.java | 4 +-
...etForCollectionLayoutAnnotationFactoryTest.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 12 +--
...okmarkableAnnotationFacetFactoryTest_class.java | 2 +-
...oicesFacetFromBoundedAnnotationFactoryTest.java | 4 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 22 +++---
.../ObjectTypeAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 4 +-
.../DomainServiceFacetAnnotationFactoryTest.java | 2 +-
.../DomainServiceLayoutFacetFactoryTest.java | 4 +-
.../title/TitleAnnotationFacetFactoryTest.java | 2 +-
.../title/TitleFacetViaTitleAnnotationTest.java | 2 +-
.../LogicalTypeFacetFromClassNameFactoryTest.java | 2 +-
.../facets/object/mixin/MixinIntendedAs.java | 2 +-
.../object/mixin/MixinIntendedAsActionTest.java | 8 +-
.../annotation/NavigableParentTestSamples.java | 4 +-
.../ordering/memberorder/LayoutOrderTest.java | 6 +-
...cetForParameterLayoutAnnotationFactoryTest.java | 6 +-
...cetForParameterLayoutAnnotationFactoryTest.java | 4 +-
.../facets/param/name/ParameterNameFacetTest.java | 4 +-
.../ParameterAnnotationFacetFactoryTest.java | 6 +-
...lableAnnotationOnParameterFacetFactoryTest.java | 6 +-
...RegExAnnotationOnParameterFacetFactoryTest.java | 2 +-
...romptStyleFacetFromPropertyAnnotation_Test.java | 4 +-
...sabledAnnotationOnPropertyFacetFactoryTest.java | 4 +-
.../MandatoryAnnotationFacetFactoryTest.java | 4 +-
.../PropertyAnnotationFacetFactoryTest.java | 12 +--
...tionWithSnapshotOnPropertyFacetFactoryTest.java | 4 +-
...llableAnnotationOnPropertyFacetFactoryTest.java | 4 +-
.../RegExAnnotationOnPropertyFacetFactoryTest.java | 2 +-
...acetForPropertyLayoutAnnotationFactoryTest.java | 4 +-
...acetForPropertyLayoutAnnotationFactoryTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsAnnotationFacetFactoryTest.java | 2 +-
...jectAssociationPredicatesTest_visibleWhere.java | 2 +-
...erviceInjectorDefaultTest_validateServices.java | 2 +-
...InjectorDefaultTest_validateServices_happy.java | 2 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 4 +-
.../isis/core/metamodel/services/grid/Bar.java | 6 +-
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../specimpl/OneToOneAssociationAbstractTest.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 2 +-
.../TemporalValueSemanticsProviderTest.java | 2 +-
.../core/runtime/events/MetamodelEventService.java | 2 +-
.../bookmarks/BookmarkServiceDefault.java | 2 +-
.../command/CommandDtoFactoryDefault.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../command/SchemaValueMarshallerDefault.java | 2 +-
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 2 +-
.../executor/MemberExecutorServiceDefault.java | 2 +-
.../factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 4 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../i18n/po/TranslationServicePoMenu.java | 18 ++---
.../icons/ObjectIconServiceDefault.java | 2 +-
.../interaction/InteractionDtoFactoryDefault.java | 2 +-
.../runtimeservices/jaxb/JaxbServiceDefault.java | 2 +-
.../locale/LanguageProviderDefault.java | 2 +-
.../locale/LocaleChoiceProviderDefault.java | 2 +-
.../memento/ObjectMementoServiceDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 6 +-
.../message/MessageServiceDefault.java | 2 +-
.../publish/CommandPublisherDefault.java | 2 +-
.../publish/EntityChangesPublisherDefault.java | 2 +-
.../EntityPropertyChangePublisherDefault.java | 2 +-
.../publish/ExecutionPublisherDefault.java | 4 +-
.../publish/ObjectLifecyclePublisherDefault.java | 2 +-
.../ExceptionRecognizerServiceDefault.java | 2 +-
.../ExceptionRecognizerForDataAccessException.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../routing/RoutingServiceDefault.java | 2 +-
.../scratchpad/ScratchpadDefault.java | 4 +-
.../session/InteractionServiceDefault.java | 2 +-
.../sitemap/SitemapServiceDefault.java | 2 +-
.../transaction/TransactionServiceSpring.java | 2 +-
.../UrlEncodingServiceWithCompression.java | 2 +-
.../user/ImpersonateMenuAdvisorDefault.java | 2 +-
.../user/ImpersonatedUserHolderDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
.../runtimeservices/xml/XmlServiceDefault.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../runtimeservices/menubars/bootstrap3/Bar.java | 6 +-
.../wrapper/dom/employees/Employee.java | 2 +-
.../security/authentication/logout/LogoutMenu.java | 18 ++---
.../manager/AuthenticationManager.java | 2 +-
.../standard/RandomCodeGeneratorDefault.java | 2 +-
.../manager/AuthorizationManager.java | 2 +-
.../changetracking/events/TimestampService.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../ImpersonatedUserHolderUsingHttpSession.java | 2 +-
.../logonlog/WebModuleLogOnExceptionLogger.java | 2 +-
.../templresources/WebModuleTemplateResources.java | 2 +-
.../HasAsciiDocDescription_description.java | 12 +--
.../HasAsciiDocDescription_sources.java | 10 +--
.../dom/_infra/seed/SeedServiceAbstract.java | 2 +-
.../UrlEncodingServiceNaiveInMemory.java | 2 +-
.../demoapp/dom/_infra/values/ValueHolder.java | 2 +-
.../_changes/ExposeCapturedChanges_changes.java | 2 +-
.../_changes/ExposeCapturedChanges_clear.java | 6 +-
.../domain/_commands/ExposePersistedCommands.java | 2 +-
.../ExposePersistedCommands_commands.java | 4 +-
.../ExposeCapturedInteractions_clear.java | 6 +-
.../ExposeCapturedInteractions_interactions.java | 2 +-
.../dom/domain/_interactions/InteractionDtoVm.java | 12 +--
.../dom/domain/actions/Action/ActionMenu.java | 12 +--
.../associateWith/ActionAssociateWithVm.java | 22 +++---
.../ActionAssociateWithVm_updateOtherProperty.java | 6 +-
.../child/ActionAssociateWithChildVm.java | 10 +--
.../child/ActionAssociateWithVm_makeFavorite.java | 4 +-
.../ActionAssociateWithVm_noLongerFavorite.java | 4 +-
.../ActionAssociateWithVm_noLongerFavorites.java | 4 +-
...ionCommandPublishingDisabledMetaAnnotation.java | 4 +-
...tionCommandPublishingEnabledMetaAnnotation.java | 4 +-
.../ActionCommandPublishingEntity.java | 2 +-
...ommandPublishingEntity_mixinUpdateProperty.java | 10 +--
...gEntity_mixinUpdatePropertyCommandDisabled.java | 10 +--
...ngEntity_mixinUpdatePropertyMetaAnnotation.java | 8 +-
...ixinUpdatePropertyMetaAnnotationOverridden.java | 10 +--
.../jdo/ActionCommandPublishingJdo.java | 22 +++---
.../jpa/ActionCommandPublishingJpa.java | 20 ++---
.../Action/domainEvent/ActionDomainEventVm.java | 18 ++---
.../ActionDomainEventVm_mixinUpdateText.java | 8 +-
.../ActionDomainEventVm_controlUpdateText.java | 4 +-
...nDomainEventVm_controlUpdateTextInvocation.java | 10 +--
...nExecutionPublishingDisabledMetaAnnotation.java | 4 +-
...onExecutionPublishingEnabledMetaAnnotation.java | 4 +-
.../ActionExecutionPublishingEntity.java | 2 +-
...cutionPublishingEntity_mixinUpdateProperty.java | 10 +--
...ngEntity_mixinUpdatePropertyMetaAnnotation.java | 8 +-
...ixinUpdatePropertyMetaAnnotationOverridden.java | 10 +--
.../jdo/ActionExecutionPublishingJdo.java | 22 +++---
.../jpa/ActionExecutionPublishingJpa.java | 20 ++---
.../actions/Action/hidden/ActionHiddenVm.java | 20 ++---
...onHiddenVm_mixinUpdateTextAndHiddenNowhere.java | 10 +--
...iddenVm_mixinUpdateTextButHiddenEverywhere.java | 10 +--
...ddenVm_mixinUpdateTextButHiddenObjectForms.java | 10 +--
...ActionHiddenVm_mixinUpdateTextNoAnnotation.java | 8 +-
...tionRestrictToNoRestrictionsMetaAnnotation.java | 4 +-
.../ActionRestrictToPrototypingMetaAnnotation.java | 4 +-
.../Action/restrictTo/ActionRestrictToVm.java | 20 ++---
...ctionRestrictToVm_mixinUpdateMetaAnnotated.java | 8 +-
...ictToVm_mixinUpdateMetaAnnotatedOverridden.java | 10 +--
...ActionRestrictToVm_mixinUpdateNoAnnotation.java | 8 +-
...ctToVm_mixinUpdateRestrictToNoRestrictions.java | 10 +--
...trictToVm_mixinUpdateRestrictToPrototyping.java | 10 +--
.../ActionSemanticsIdempotentMetaAnnotation.java | 4 +-
.../ActionSemanticsSafeMetaAnnotation.java | 4 +-
.../Action/semantics/ActionSemanticsVm.java | 20 ++---
...ticsVm_mixinIncrementByAmountNonIdempotent.java | 8 +-
...tionSemanticsVm_mixinIncrementNoAnnotation.java | 6 +-
...ionSemanticsVm_mixinIncrementNonIdempotent.java | 8 +-
...csVm_mixinIncrementNonIdempotentAreYouSure.java | 8 +-
...ticsVm_mixinReportPropertyForSemanticsSafe.java | 6 +-
...Vm_mixinSetToValueForPropertyMetaAnnotated.java | 8 +-
...tToValueForPropertyMetaAnnotatedOverridden.java | 8 +-
...inSetToValueForPropertySemanticsIdempotent.java | 8 +-
...ueForPropertySemanticsIdempotentAreYouSure.java | 8 +-
.../actions/Action/typeOf/ActionTypeOfVm.java | 16 ++--
.../Action/typeOf/child/ActionTypeOfChildVm.java | 10 +--
.../actions/ActionLayout/ActionLayoutMenu.java | 14 ++--
.../position/ActionLayoutPositionVm.java | 12 +--
.../ActionLayoutPositionVm_annotatedBelow.java | 8 +-
.../ActionLayoutPositionVm_annotatedPanel.java | 8 +-
...ionLayoutPositionVm_annotatedPanelDropDown.java | 8 +-
.../ActionLayoutPositionVm_annotatedRight.java | 8 +-
.../ActionLayoutPositionVm_layoutBelow.java | 8 +-
.../ActionLayoutPositionVm_layoutPanel.java | 8 +-
...ActionLayoutPositionVm_layoutPanelDropDown.java | 8 +-
.../ActionLayoutPositionVm_layoutRight.java | 8 +-
.../promptStyle/ActionLayoutPromptStyleVm.java | 14 ++--
.../ActionLayoutPromptStyleVm_annotatedInline.java | 10 +--
...ayoutPromptStyleVm_annotatedInlineAsIfEdit.java | 10 +--
.../ActionLayoutPromptStyleVm_annotatedModal.java | 10 +--
...ActionLayoutPromptStyleVm_annotatedSidebar.java | 10 +--
.../ActionLayoutPromptStyleVm_layoutDialog.java | 10 +--
.../ActionLayoutPromptStyleVm_layoutInline.java | 8 +-
...onLayoutPromptStyleVm_layoutInlineAsIfEdit.java | 8 +-
.../progmodel/assoc/AssociatedActionDemo.java | 12 +--
.../progmodel/assoc/AssociatedActionMenu.java | 12 +--
.../domain/actions/progmodel/assoc/DemoItem.java | 12 +--
.../domain/actions/progmodel/depargs/DemoItem.java | 12 +--
.../progmodel/depargs/DependentArgsActionDemo.java | 16 ++--
.../DependentArgsActionDemo_bulkAction.java | 12 +--
.../DependentArgsActionDemo_useAutoComplete.java | 14 ++--
.../DependentArgsActionDemo_useChoices.java | 14 ++--
.../DependentArgsActionDemo_useChoices2.java | 14 ++--
.../DependentArgsActionDemo_useDefault.java | 14 ++--
.../DependentArgsActionDemo_useDisable.java | 14 ++--
.../depargs/DependentArgsActionDemo_useHide.java | 14 ++--
.../DependentArgsActionDemo_useIndependent.java | 12 +--
.../progmodel/depargs/DependentArgsActionMenu.java | 12 +--
.../domain/actions/progmodel/depargs/Parity.java | 2 +-
.../collections/Collection/CollectionMenu.java | 14 ++--
.../domainEvent/CollectionDomainEventVm.java | 12 +--
.../CollectionDomainEventVm_addChild.java | 6 +-
.../CollectionDomainEventVm_removeChild.java | 8 +-
.../child/CollectionDomainEventChildVm.java | 10 +--
.../CollectionDomainEventControlService.java | 2 +-
.../CollectionDomainEventVm_controlChildren.java | 4 +-
...ionDomainEventVm_controlChildrenVisibility.java | 12 +--
.../CollectionLayout/CollectionLayoutMenu.java | 14 ++--
.../objects/DomainObject/DomainObjectMenu.java | 14 ++--
.../DomainObjectEntityChangePublishingEntity.java | 2 +-
...PublishingEntity_updatePropertyUsingAction.java | 8 +-
.../DomainObjectEntityChangePublishingVm.java | 6 +-
...omainObjectEntityChangePublishingVm_create.java | 8 +-
...omainObjectEntityChangePublishingVm_delete.java | 8 +-
...inObjectEntityChangePublishingVm_updateAll.java | 8 +-
...ObjectEntityChangePublishingDisabledEntity.java | 2 +-
...hingVm_publishingDisabledAnnotatedEntities.java | 2 +-
...ainObjectEntityChangePublishingDisabledJdo.java | 12 +--
...ainObjectEntityChangePublishingDisabledJpa.java | 12 +--
...nObjectEntityChangePublishingEnabledEntity.java | 2 +-
...shingVm_publishingEnabledAnnotatedEntities.java | 2 +-
...mainObjectEntityChangePublishingEnabledJdo.java | 12 +--
...mainObjectEntityChangePublishingEnabledJpa.java | 12 +--
...ntityChangePublishingEnabledMetaAnnotation.java | 4 +-
...ChangePublishingEnabledMetaAnnotatedEntity.java | 2 +-
...gVm_publishingEnabledMetaAnnotatedEntities.java | 2 +-
...ityChangePublishingEnabledMetaAnnotatedJdo.java | 10 +--
...ityChangePublishingEnabledMetaAnnotatedJpa.java | 10 +--
...tityChangePublishingDisabledMetaAnnotation.java | 4 +-
...PublishingEnabledMetaAnnotOverriddenEntity.java | 2 +-
...blishingEnabledMetaAnnotOverriddenEntities.java | 2 +-
...ngePublishingEnabledMetaAnnotOverriddenJdo.java | 12 +--
...ngePublishingEnabledMetaAnnotOverriddenJpa.java | 12 +--
.../viewmodels/jaxbrefentity/JaxbRefEntity.java | 6 +-
.../jaxbrefentity/StatefulVmJaxbRefsEntity.java | 22 +++---
.../viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java | 4 +-
.../viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java | 4 +-
.../viewmodels/usingjaxb/StatefulVmUsingJaxb.java | 22 +++---
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 14 ++--
.../objects/other/embedded/EmbeddedTypeMenu.java | 10 +--
.../objects/other/embedded/EmbeddedTypeVm.java | 8 +-
.../other/embedded/jdo/ComplexNumberJdo.java | 4 +-
.../other/embedded/jdo/NumberConstantJdo.java | 8 +-
.../jdo/NumberConstantJdo_updateNumber.java | 8 +-
.../other/embedded/jpa/ComplexNumberJpa.java | 4 +-
.../other/embedded/jpa/NumberConstantJpa.java | 8 +-
.../jpa/NumberConstantJpa_updateNumber.java | 8 +-
.../embedded/persistence/NumberConstantEntity.java | 2 +-
.../domain/objects/other/mixins/CountHolder.java | 2 +-
.../other/mixins/CountHolder_explanation.java | 4 +-
.../mixins/CountHolder_fibonacciSequence.java | 4 +-
.../other/mixins/CountHolder_updateCount.java | 6 +-
.../objects/other/mixins/FibonacciNumberVm.java | 12 +--
.../dom/domain/objects/other/mixins/MixinMenu.java | 10 +--
.../dom/domain/objects/other/mixins/MixinVm.java | 10 +--
.../domain/properties/Property/PropertyMenu.java | 12 +--
...rtyCommandPublishingDisabledMetaAnnotation.java | 4 +-
...ertyCommandPublishingEnabledMetaAnnotation.java | 4 +-
.../PropertyCommandPublishingEntity.java | 2 +-
.../jdo/PropertyCommandPublishingJdo.java | 14 ++--
.../jpa/PropertyCommandPublishingJpa.java | 12 +--
.../domainEvent/PropertyDomainEventVm.java | 12 +--
.../PropertyDomainEventControlService.java | 2 +-
.../PropertyDomainEventVm_controlText.java | 4 +-
.../PropertyDomainEventVm_controlTextEditing.java | 12 +--
.../editing/EditingEnabledMetaAnnotation.java | 4 +-
.../Property/editing/PropertyEditingVm.java | 12 +--
...yExecutionPublishingDisabledMetaAnnotation.java | 4 +-
...tyExecutionPublishingEnabledMetaAnnotation.java | 4 +-
.../PropertyExecutionPublishingEntity.java | 2 +-
.../jdo/PropertyExecutionPublishingJdo.java | 14 ++--
.../jpa/PropertyExecutionPublishingJpa.java | 12 +--
.../fileAccept/FileAcceptPdfMetaAnnotation.java | 4 +-
.../Property/fileAccept/PropertyFileAcceptVm.java | 12 +--
...FileAcceptVm_updateClobWithParameterLayout.java | 14 ++--
...pertyFileAcceptVm_updateWithMetaAnnotation.java | 12 +--
...cceptVm_updateWithMetaAnnotationOverridden.java | 12 +--
...ertyFileAcceptVm_updateWithParameterLayout.java | 14 ++--
.../hidden/HiddenEverywhereMetaAnnotation.java | 4 +-
.../Property/hidden/PropertyHiddenVm.java | 16 ++--
...tyHiddenVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 6 +-
.../hidden/PropertyHiddenVm_returnsChildren.java | 6 +-
.../hidden/child/PropertyHiddenChildVm.java | 12 +--
.../child/PropertyHiddenChildVm_mixinProperty.java | 6 +-
.../maxLength/MaxLength10MetaAnnotation.java | 4 +-
.../Property/maxLength/PropertyMaxLengthVm.java | 12 +--
...opertyMaxLengthVm_updateWithMetaAnnotation.java | 12 +--
...engthVm_updateWithMetaAnnotationOverridden.java | 12 +--
...pertyMaxLengthVm_updateWithParameterLayout.java | 12 +--
.../MustSatisfyOfWorkingAgeMetaAnnotation.java | 4 +-
.../mustSatisfy/PropertyMustSatisfyVm.java | 12 +--
...ertyMustSatisfyVm_updateWithMetaAnnotation.java | 14 ++--
...tisfyVm_updateWithMetaAnnotationOverridden.java | 12 +--
...rtyMustSatisfyVm_updateWithParameterLayout.java | 12 +--
.../OptionalityOptionalMetaAnnotation.java | 6 +-
.../optionality/PropertyOptionalityVm.java | 14 ++--
...alityVm_updateMandatoryWithParameterLayout.java | 14 ++--
...ertyOptionalityVm_updateWithMetaAnnotation.java | 14 ++--
...alityVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...rtyOptionalityVm_updateWithParameterLayout.java | 14 ++--
.../Property/projecting/PropertyProjectingVm.java | 12 +--
.../PropertyProjectingVm_returnsChildren.java | 4 +-
.../child/PropertyProjectingChildVm.java | 14 ++--
.../projecting/jdo/PropertyProjectingChildJdo.java | 10 +--
.../projecting/jpa/PropertyProjectingChildJpa.java | 8 +-
.../persistence/PropertyProjectingChildEntity.java | 2 +-
.../regexPattern/PropertyRegexPatternVm.java | 12 +--
...rtyRegexPatternVm_updateWithMetaAnnotation.java | 14 ++--
...tternVm_updateWithMetaAnnotationOverridden.java | 12 +--
...tyRegexPatternVm_updateWithParameterLayout.java | 12 +--
.../RegexPatternEmailComMetaAnnotation.java | 8 +-
.../Property/snapshot/PropertySnapshotVm.java | 14 ++--
.../PropertySnapshotVm_takeXmlSnapshot.java | 6 +-
.../snapshot/SnapshotExcludedMetaAnnotation.java | 4 +-
.../snapshot/SnapshotIncludedMetaAnnotation.java | 4 +-
.../PropertyLayout/PropertyLayoutMenu.java | 12 +--
.../cssClass/CssClassRedMetaAnnotation.java | 4 +-
.../cssClass/PropertyLayoutCssClassVm.java | 14 ++--
.../PropertyLayoutCssClassVm_mixinProperty.java | 6 +-
...CssClassVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 4 +-
...yLayoutCssClassVm_updateWithMetaAnnotation.java | 14 ++--
...ClassVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...LayoutCssClassVm_updateWithParameterLayout.java | 14 ++--
.../describedAs/DescribedAsMetaAnnotation.java | 4 +-
.../describedAs/PropertyLayoutDescribedAsVm.java | 14 ++--
.../PropertyLayoutDescribedAsVm_mixinProperty.java | 4 +-
...cribedAsVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 4 +-
...youtDescribedAsVm_updateWithMetaAnnotation.java | 14 ++--
...bedAsVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...outDescribedAsVm_updateWithParameterLayout.java | 14 ++--
.../hidden/HiddenEverywhereMetaAnnotation.java | 4 +-
.../hidden/PropertyLayoutHiddenVm.java | 18 ++---
...utHiddenVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 6 +-
.../PropertyLayoutHiddenVm_returnsChildren.java | 6 +-
.../hidden/child/PropertyLayoutHiddenChildVm.java | 14 ++--
.../PropertyLayoutHiddenChildVm_mixinProperty.java | 6 +-
.../LabelPositionLeftMetaAnnotation.java | 6 +-
.../LabelPositionTopMetaAnnotation.java | 6 +-
.../PropertyLayoutLabelPositionVm.java | 16 ++--
...ropertyLayoutLabelPositionVm_mixinProperty.java | 8 +-
...PositionVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 6 +-
...rtyLayoutLabelPositionVm_updateVariantLeft.java | 16 ++--
...rtyLayoutLabelPositionVm_updateVariantNone.java | 16 ++--
...tLabelPositionVm_updateVariantNotSpecified.java | 16 ++--
...tyLayoutLabelPositionVm_updateVariantRight.java | 16 ++--
...ertyLayoutLabelPositionVm_updateVariantTop.java | 16 ++--
...utLabelPositionVm_updateWithMetaAnnotation.java | 14 ++--
...itionVm_updateWithMetaAnnotationOverridden.java | 16 ++--
...tLabelPositionVm_updateWithParameterLayout.java | 16 ++--
.../multiLine/MultiLine10MetaAnnotation.java | 4 +-
.../multiLine/PropertyLayoutMultiLineVm.java | 14 ++--
.../PropertyLayoutMultiLineVm_mixinProperty.java | 4 +-
...ultiLineVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 4 +-
...LayoutMultiLineVm_updateWithMetaAnnotation.java | 14 ++--
...iLineVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...ayoutMultiLineVm_updateWithParameterLayout.java | 14 ++--
.../PropertyLayout/named/NamedMetaAnnotation.java | 4 +-
.../named/PropertyLayoutNamedVm.java | 14 ++--
.../named/PropertyLayoutNamedVm_mixinProperty.java | 4 +-
...outNamedVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 4 +-
...ertyLayoutNamedVm_updateWithMetaAnnotation.java | 14 ++--
...NamedVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...rtyLayoutNamedVm_updateWithParameterLayout.java | 14 ++--
.../PropertyLayout/navigable/FileNodeType.java | 2 +-
.../PropertyLayout/navigable/FileNodeVm.java | 16 ++--
.../navigable/FileNodeVm_returnsTree.java | 6 +-
.../renderDay/PropertyLayoutRenderDayVm.java | 16 ++--
.../PropertyLayoutRenderDayVm_downloadAsXml.java | 6 +-
...RenderDayVm_mixinEndDateWithMetaAnnotation.java | 4 +-
...m_mixinEndDateWithMetaAnnotationOverridden.java | 6 +-
...RenderDayVm_mixinEndDateWithPropertyLayout.java | 6 +-
...enderDayVm_updateEndDateWithMetaAnnotation.java | 14 ++--
..._updateEndDateWithMetaAnnotationOverridden.java | 16 ++--
...nderDayVm_updateEndDateWithParameterLayout.java | 16 ++--
.../RenderDayMetaAnnotationEndDateExclusive.java | 6 +-
.../RenderDayMetaAnnotationStartDateInclusive.java | 6 +-
.../repainting/PropertyLayoutRepaintingVm.java | 16 ++--
.../PropertyLayoutRepaintingVm_mixinProperty.java | 6 +-
...paintingVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 6 +-
.../RepaintingNoRepaintMetaAnnotation.java | 4 +-
.../RepaintingRepaintMetaAnnotation.java | 4 +-
.../PropertyLayoutTypicalLengthVm.java | 14 ++--
...ropertyLayoutTypicalLengthVm_mixinProperty.java | 4 +-
...alLengthVm_mixinPropertyWithMetaAnnotation.java | 4 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 4 +-
...utTypicalLengthVm_updateWithMetaAnnotation.java | 14 ++--
...engthVm_updateWithMetaAnnotationOverridden.java | 14 ++--
...tTypicalLengthVm_updateWithParameterLayout.java | 14 ++--
.../typicalLength/TypicalLengthMetaAnnotation.java | 4 +-
.../dom/featured/customui/latlng/Latitude.java | 4 +-
.../dom/featured/customui/latlng/Longitude.java | 4 +-
.../demoapp/dom/featured/customui/latlng/Zoom.java | 4 +-
.../featured/customui/vm/WhereInTheWorldMenu.java | 14 ++--
.../featured/customui/vm/WhereInTheWorldVm.java | 6 +-
.../layout/describedAs/DescribedAsMenu.java | 12 +--
.../featured/layout/describedAs/DescribedAsVm.java | 34 ++++-----
.../demoapp/dom/featured/layout/tabs/TabDemo.java | 14 ++--
.../demoapp/dom/featured/layout/tabs/TabMenu.java | 10 +--
.../java/demoapp/dom/homepage/DemoHomePage.java | 8 +-
.../demoapp/dom/services/core/ServicesMenu.java | 12 +--
.../ErrorReportingServiceDemoVm.java | 12 +--
.../eventbusservice/EventBusServiceDemoVm.java | 14 ++--
.../core/eventbusservice/EventLogEntryJdo.java | 12 +--
.../core/eventbusservice/EventLogEntryJpa.java | 12 +--
.../EventSubscriberDemoImplementation.java | 6 +-
.../core/messageservice/MessageServiceDemoVm.java | 12 +--
.../core/wrapperFactory/WrapperFactoryEntity.java | 2 +-
...pperFactoryEntity_mixinUpdatePropertyAsync.java | 8 +-
...pperFactoryEntity_updatePropertyAsyncMixin.java | 8 +-
.../core/wrapperFactory/jdo/WrapperFactoryJdo.java | 20 ++---
.../core/wrapperFactory/jpa/WrapperFactoryJpa.java | 20 ++---
.../xmlSnapshotService/XmlSnapshotParentVm.java | 16 ++--
.../XmlSnapshotParentVm_takeXmlSnapshot.java | 6 +-
.../child/XmlSnapshotChildVm.java | 10 +--
.../xmlSnapshotService/peer/XmlSnapshotPeerVm.java | 14 ++--
.../peer/child/XmlSnapshotPeerChildVm.java | 10 +--
.../services/extensions/secman/ExtSecManMenu.java | 14 ++--
.../extensions/secman/apptenancy/AppTenancyVm.java | 18 ++---
.../secman/apptenancy/jdo/TenantedJdo.java | 18 ++---
.../secman/apptenancy/jpa/TenantedJpa.java | 18 ++---
.../apptenancy/persistence/TenantedEntity.java | 2 +-
.../java/demoapp/dom/types/isis/IsisTypesMenu.java | 14 ++--
.../demoapp/dom/types/isis/blobs/IsisBlobs.java | 20 ++---
.../types/isis/blobs/holder/IsisBlobHolder.java | 2 +-
.../types/isis/blobs/holder/IsisBlobHolder2.java | 8 +-
.../holder/IsisBlobHolder_actionReturning.java | 4 +-
.../IsisBlobHolder_actionReturningCollection.java | 4 +-
.../blobs/holder/IsisBlobHolder_mixinProperty.java | 6 +-
...sBlobHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisBlobHolder_updateReadOnlyProperty.java | 10 +--
...obHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../dom/types/isis/blobs/jdo/IsisBlobJdo.java | 12 +--
.../dom/types/isis/blobs/jpa/IsisBlobJpa.java | 12 +--
.../isis/blobs/persistence/IsisBlobEntity.java | 2 +-
.../dom/types/isis/blobs/vm/IsisBlobVm.java | 14 ++--
.../demoapp/dom/types/isis/clobs/IsisClobs.java | 20 ++---
.../types/isis/clobs/holder/IsisClobHolder.java | 2 +-
.../types/isis/clobs/holder/IsisClobHolder2.java | 8 +-
.../holder/IsisClobHolder_actionReturning.java | 4 +-
.../IsisClobHolder_actionReturningCollection.java | 4 +-
.../clobs/holder/IsisClobHolder_mixinProperty.java | 6 +-
...sClobHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisClobHolder_updateReadOnlyProperty.java | 10 +--
...obHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../dom/types/isis/clobs/jdo/IsisClobJdo.java | 12 +--
.../dom/types/isis/clobs/jpa/IsisClobJpa.java | 12 +--
.../isis/clobs/persistence/IsisClobEntity.java | 2 +-
.../dom/types/isis/clobs/vm/IsisClobVm.java | 14 ++--
.../localresourcepaths/IsisLocalResourcePaths.java | 20 ++---
.../holder/IsisLocalResourcePathHolder.java | 2 +-
.../holder/IsisLocalResourcePathHolder2.java | 8 +-
...sisLocalResourcePathHolder_actionReturning.java | 4 +-
...sourcePathHolder_actionReturningCollection.java | 4 +-
.../IsisLocalResourcePathHolder_mixinProperty.java | 6 +-
...ePathHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...lResourcePathHolder_updateReadOnlyProperty.java | 10 +--
...thHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/IsisLocalResourcePathJdo.java | 12 +--
.../jpa/IsisLocalResourcePathJpa.java | 12 +--
.../persistence/IsisLocalResourcePathEntity.java | 2 +-
.../vm/IsisLocalResourcePathVm.java | 14 ++--
.../dom/types/isis/markups/IsisMarkups.java | 20 ++---
.../isis/markups/holder/IsisMarkupHolder.java | 2 +-
.../isis/markups/holder/IsisMarkupHolder2.java | 8 +-
.../holder/IsisMarkupHolder_actionReturning.java | 4 +-
...IsisMarkupHolder_actionReturningCollection.java | 4 +-
.../holder/IsisMarkupHolder_mixinProperty.java | 6 +-
...arkupHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisMarkupHolder_updateReadOnlyProperty.java | 10 +--
...upHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../dom/types/isis/markups/jdo/IsisMarkupJdo.java | 14 ++--
.../dom/types/isis/markups/jpa/IsisMarkupJpa.java | 14 ++--
.../isis/markups/persistence/IsisMarkupEntity.java | 2 +-
.../dom/types/isis/markups/vm/IsisMarkupVm.java | 16 ++--
.../dom/types/isis/passwords/IsisPasswords.java | 20 ++---
.../isis/passwords/holder/IsisPasswordHolder.java | 2 +-
.../isis/passwords/holder/IsisPasswordHolder2.java | 8 +-
.../holder/IsisPasswordHolder_actionReturning.java | 4 +-
...isPasswordHolder_actionReturningCollection.java | 4 +-
.../holder/IsisPasswordHolder_mixinProperty.java | 6 +-
...swordHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisPasswordHolder_updateReadOnlyProperty.java | 10 +--
...rdHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/isis/passwords/jdo/IsisPasswordJdo.java | 12 +--
.../types/isis/passwords/jpa/IsisPasswordJpa.java | 12 +--
.../passwords/persistence/IsisPasswordEntity.java | 10 +--
.../types/isis/passwords/vm/IsisPasswordVm.java | 14 ++--
.../dom/types/isisext/IsisExtTypesMenu.java | 14 ++--
.../dom/types/isisext/asciidocs/IsisAsciiDocs.java | 20 ++---
.../asciidocs/holder/IsisAsciiDocHolder.java | 2 +-
.../asciidocs/holder/IsisAsciiDocHolder2.java | 8 +-
.../holder/IsisAsciiDocHolder_actionReturning.java | 4 +-
...isAsciiDocHolder_actionReturningCollection.java | 4 +-
.../holder/IsisAsciiDocHolder_mixinProperty.java | 6 +-
...iiDocHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisAsciiDocHolder_updateReadOnlyProperty.java | 10 +--
...ocHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../isisext/asciidocs/jdo/IsisAsciiDocJdo.java | 14 ++--
.../isisext/asciidocs/jpa/IsisAsciiDocJpa.java | 14 ++--
.../asciidocs/persistence/IsisAsciiDocEntity.java | 2 +-
.../types/isisext/asciidocs/vm/IsisAsciiDocVm.java | 16 ++--
.../dom/types/isisext/cal/IsisCalendarEvents.java | 20 ++---
.../cal/holder/IsisCalendarEventHolder.java | 2 +-
.../cal/holder/IsisCalendarEventHolder2.java | 8 +-
.../IsisCalendarEventHolder_actionReturning.java | 4 +-
...endarEventHolder_actionReturningCollection.java | 4 +-
.../IsisCalendarEventHolder_mixinProperty.java | 6 +-
...EventHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...CalendarEventHolder_updateReadOnlyProperty.java | 10 +--
...ntHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../isisext/cal/jdo/IsisCalendarEventJdo.java | 12 +--
.../isisext/cal/jpa/IsisCalendarEventJpa.java | 12 +--
.../cal/jpa/IsisCalendarEventJpa_update.java | 8 +-
.../cal/persistence/IsisCalendarEventEntity.java | 2 +-
.../types/isisext/cal/vm/IsisCalendarEventVm.java | 14 ++--
.../dom/types/isisext/markdowns/IsisMarkdowns.java | 20 ++---
.../markdowns/holder/IsisMarkdownHolder.java | 2 +-
.../markdowns/holder/IsisMarkdownHolder2.java | 8 +-
.../holder/IsisMarkdownHolder_actionReturning.java | 4 +-
...isMarkdownHolder_actionReturningCollection.java | 4 +-
.../holder/IsisMarkdownHolder_mixinProperty.java | 6 +-
...kdownHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../IsisMarkdownHolder_updateReadOnlyProperty.java | 10 +--
...wnHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../isisext/markdowns/jdo/IsisMarkdownJdo.java | 14 ++--
.../isisext/markdowns/jpa/IsisMarkdownJpa.java | 14 ++--
.../markdowns/persistence/IsisMarkdownEntity.java | 2 +-
.../types/isisext/markdowns/vm/IsisMarkdownVm.java | 16 ++--
.../dom/types/isisext/sse/AsyncActionDemo.java | 10 +--
.../dom/types/isisext/sse/AsyncActionMenu.java | 12 +--
.../demoapp/dom/types/isisext/sse/DemoTask.java | 8 +-
.../dom/types/javaawt/JavaAwtTypesMenu.java | 14 ++--
.../javaawt/images/JavaAwtBufferedImages.java | 20 ++---
.../images/holder/JavaAwtBufferedImageHolder.java | 2 +-
.../images/holder/JavaAwtBufferedImageHolder2.java | 8 +-
...JavaAwtBufferedImageHolder_actionReturning.java | 6 +-
...feredImageHolder_actionReturningCollection.java | 6 +-
.../JavaAwtBufferedImageHolder_mixinProperty.java | 6 +-
...ImageHolder_updateReadOnlyOptionalProperty.java | 16 ++--
...BufferedImageHolder_updateReadOnlyProperty.java | 12 +--
...geHolder_updateReadOnlyPropertyWithChoices.java | 12 +--
.../images/jdo/JavaAwtBufferedImageJdo.java | 10 +--
.../images/jpa/JavaAwtBufferedImageJpa.java | 10 +--
.../persistence/JavaAwtBufferedImageEntity.java | 2 +-
.../javaawt/images/vm/JavaAwtBufferedImageVm.java | 12 +--
.../dom/types/javalang/JavaLangTypesMenu.java | 14 ++--
.../types/javalang/JavaLangWrapperTypesMenu.java | 14 ++--
.../types/javalang/booleans/WrapperBooleans.java | 20 ++---
.../booleans/holder/WrapperBooleanHolder.java | 2 +-
.../booleans/holder/WrapperBooleanHolder2.java | 8 +-
.../WrapperBooleanHolder_actionReturning.java | 4 +-
...perBooleanHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperBooleanHolder_mixinProperty.java | 6 +-
...oleanHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...rapperBooleanHolder_updateReadOnlyProperty.java | 10 +--
...anHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javalang/booleans/jdo/WrapperBooleanJdo.java | 12 +--
.../javalang/booleans/jpa/WrapperBooleanJpa.java | 12 +--
.../booleans/persistence/WrapperBooleanEntity.java | 2 +-
.../javalang/booleans/vm/WrapperBooleanVm.java | 14 ++--
.../dom/types/javalang/bytes/WrapperBytes.java | 20 ++---
.../javalang/bytes/holder/WrapperByteHolder.java | 2 +-
.../javalang/bytes/holder/WrapperByteHolder2.java | 8 +-
.../holder/WrapperByteHolder_actionReturning.java | 4 +-
...rapperByteHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperByteHolder_mixinProperty.java | 6 +-
...rByteHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../WrapperByteHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/javalang/bytes/jdo/WrapperByteJdo.java | 12 +--
.../types/javalang/bytes/jpa/WrapperByteJpa.java | 12 +--
.../bytes/persistence/WrapperByteEntity.java | 2 +-
.../dom/types/javalang/bytes/vm/WrapperByteVm.java | 14 ++--
.../javalang/characters/WrapperCharacters.java | 20 ++---
.../characters/holder/WrapperCharacterHolder.java | 2 +-
.../characters/holder/WrapperCharacterHolder2.java | 8 +-
.../WrapperCharacterHolder_actionReturning.java | 4 +-
...rCharacterHolder_actionReturningCollection.java | 4 +-
.../WrapperCharacterHolder_mixinProperty.java | 6 +-
...acterHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...pperCharacterHolder_updateReadOnlyProperty.java | 10 +--
...erHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../characters/jdo/WrapperCharacterJdo.java | 12 +--
.../characters/jpa/WrapperCharacterJpa.java | 12 +--
.../persistence/WrapperCharacterEntity.java | 2 +-
.../javalang/characters/vm/WrapperCharacterVm.java | 14 ++--
.../dom/types/javalang/doubles/WrapperDoubles.java | 20 ++---
.../doubles/holder/WrapperDoubleHolder.java | 2 +-
.../doubles/holder/WrapperDoubleHolder2.java | 8 +-
.../WrapperDoubleHolder_actionReturning.java | 4 +-
...pperDoubleHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperDoubleHolder_mixinProperty.java | 6 +-
...oubleHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...WrapperDoubleHolder_updateReadOnlyProperty.java | 10 +--
...leHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javalang/doubles/jdo/WrapperDoubleJdo.java | 12 +--
.../javalang/doubles/jpa/WrapperDoubleJpa.java | 12 +--
.../doubles/persistence/WrapperDoubleEntity.java | 2 +-
.../types/javalang/doubles/vm/WrapperDoubleVm.java | 14 ++--
.../dom/types/javalang/floats/WrapperFloats.java | 20 ++---
.../javalang/floats/holder/WrapperFloatHolder.java | 2 +-
.../floats/holder/WrapperFloatHolder2.java | 8 +-
.../holder/WrapperFloatHolder_actionReturning.java | 4 +-
...apperFloatHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperFloatHolder_mixinProperty.java | 6 +-
...FloatHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../WrapperFloatHolder_updateReadOnlyProperty.java | 10 +--
...atHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/javalang/floats/jdo/WrapperFloatJdo.java | 12 +--
.../types/javalang/floats/jpa/WrapperFloatJpa.java | 12 +--
.../floats/persistence/WrapperFloatEntity.java | 2 +-
.../types/javalang/floats/vm/WrapperFloatVm.java | 14 ++--
.../types/javalang/integers/WrapperIntegers.java | 20 ++---
.../integers/holder/WrapperIntegerHolder.java | 2 +-
.../integers/holder/WrapperIntegerHolder2.java | 8 +-
.../WrapperIntegerHolder_actionReturning.java | 4 +-
...perIntegerHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperIntegerHolder_mixinProperty.java | 6 +-
...tegerHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...rapperIntegerHolder_updateReadOnlyProperty.java | 10 +--
...erHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javalang/integers/jdo/WrapperIntegerJdo.java | 12 +--
.../javalang/integers/jpa/WrapperIntegerJpa.java | 12 +--
.../integers/persistence/WrapperIntegerEntity.java | 2 +-
.../javalang/integers/vm/WrapperIntegerVm.java | 14 ++--
.../dom/types/javalang/longs/WrapperLongs.java | 20 ++---
.../javalang/longs/holder/WrapperLongHolder.java | 2 +-
.../javalang/longs/holder/WrapperLongHolder2.java | 8 +-
.../holder/WrapperLongHolder_actionReturning.java | 4 +-
...rapperLongHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperLongHolder_mixinProperty.java | 6 +-
...rLongHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../WrapperLongHolder_updateReadOnlyProperty.java | 10 +--
...ngHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/javalang/longs/jdo/WrapperLongJdo.java | 12 +--
.../types/javalang/longs/jpa/WrapperLongJpa.java | 12 +--
.../longs/persistence/WrapperLongEntity.java | 2 +-
.../dom/types/javalang/longs/vm/WrapperLongVm.java | 14 ++--
.../dom/types/javalang/shorts/WrapperShorts.java | 20 ++---
.../javalang/shorts/holder/WrapperShortHolder.java | 2 +-
.../shorts/holder/WrapperShortHolder2.java | 8 +-
.../holder/WrapperShortHolder_actionReturning.java | 4 +-
...apperShortHolder_actionReturningCollection.java | 4 +-
.../holder/WrapperShortHolder_mixinProperty.java | 6 +-
...ShortHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../WrapperShortHolder_updateReadOnlyProperty.java | 10 +--
...rtHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/javalang/shorts/jdo/WrapperShortJdo.java | 12 +--
.../types/javalang/shorts/jpa/WrapperShortJpa.java | 12 +--
.../shorts/persistence/WrapperShortEntity.java | 2 +-
.../types/javalang/shorts/vm/WrapperShortVm.java | 14 ++--
.../types/javalang/strings/JavaLangStrings.java | 20 ++---
.../strings/holder/JavaLangStringHolder.java | 2 +-
.../strings/holder/JavaLangStringHolder2.java | 8 +-
.../JavaLangStringHolder_actionReturning.java | 4 +-
...LangStringHolder_actionReturningCollection.java | 4 +-
.../holder/JavaLangStringHolder_mixinProperty.java | 6 +-
...tringHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...avaLangStringHolder_updateReadOnlyProperty.java | 10 +--
...ngHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javalang/strings/jdo/JavaLangStringJdo.java | 12 +--
.../javalang/strings/jpa/JavaLangStringJpa.java | 12 +--
.../strings/persistence/JavaLangStringEntity.java | 2 +-
.../javalang/strings/vm/JavaLangStringVm.java | 14 ++--
.../dom/types/javalang/voids/JavaLangVoids.java | 16 ++--
.../dom/types/javamath/JavaMathTypesMenu.java | 14 ++--
.../javamath/bigdecimals/JavaMathBigDecimals.java | 20 ++---
.../holder/JavaMathBigDecimalHolder.java | 2 +-
.../holder/JavaMathBigDecimalHolder2.java | 8 +-
.../JavaMathBigDecimalHolder_actionReturning.java | 4 +-
...BigDecimalHolder_actionReturningCollection.java | 4 +-
.../JavaMathBigDecimalHolder_mixinProperty.java | 6 +-
...cimalHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...athBigDecimalHolder_updateReadOnlyProperty.java | 10 +--
...alHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../bigdecimals/jdo/JavaMathBigDecimalJdo.java | 12 +--
.../bigdecimals/jpa/JavaMathBigDecimalJpa.java | 12 +--
.../persistence/JavaMathBigDecimalEntity.java | 2 +-
.../bigdecimals/vm/JavaMathBigDecimalVm.java | 14 ++--
.../javamath/bigintegers/JavaMathBigIntegers.java | 20 ++---
.../holder/JavaMathBigIntegerHolder.java | 2 +-
.../holder/JavaMathBigIntegerHolder2.java | 8 +-
.../JavaMathBigIntegerHolder_actionReturning.java | 4 +-
...BigIntegerHolder_actionReturningCollection.java | 4 +-
.../JavaMathBigIntegerHolder_mixinProperty.java | 6 +-
...tegerHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...athBigIntegerHolder_updateReadOnlyProperty.java | 10 +--
...erHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../bigintegers/jdo/JavaMathBigIntegerJdo.java | 12 +--
.../bigintegers/jpa/JavaMathBigIntegerJpa.java | 12 +--
.../persistence/JavaMathBigIntegerEntity.java | 2 +-
.../bigintegers/vm/JavaMathBigIntegerVm.java | 14 ++--
.../dom/types/javanet/JavaNetTypesMenu.java | 14 ++--
.../dom/types/javanet/urls/JavaNetUrls.java | 20 ++---
.../javanet/urls/holder/JavaNetUrlHolder.java | 2 +-
.../javanet/urls/holder/JavaNetUrlHolder2.java | 8 +-
.../holder/JavaNetUrlHolder_actionReturning.java | 4 +-
...JavaNetUrlHolder_actionReturningCollection.java | 4 +-
.../holder/JavaNetUrlHolder_mixinProperty.java | 6 +-
...etUrlHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../JavaNetUrlHolder_updateReadOnlyProperty.java | 10 +--
...rlHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../dom/types/javanet/urls/jdo/JavaNetUrlJdo.java | 12 +--
.../dom/types/javanet/urls/jpa/JavaNetUrlJpa.java | 12 +--
.../javanet/urls/persistence/JavaNetUrlEntity.java | 2 +-
.../dom/types/javanet/urls/vm/JavaNetUrlVm.java | 14 ++--
.../dom/types/javasql/JavaSqlTypesMenu.java | 14 ++--
.../types/javasql/javasqldate/JavaSqlDates.java | 20 ++---
.../javasqldate/holder/JavaSqlDateHolder.java | 2 +-
.../javasqldate/holder/JavaSqlDateHolder2.java | 8 +-
.../javasqldate/holder/JavaSqlDateHolder3.java | 10 +--
.../holder/JavaSqlDateHolder_actionReturning.java | 4 +-
...avaSqlDateHolder_actionReturningCollection.java | 4 +-
.../holder/JavaSqlDateHolder_mixinProperty.java | 6 +-
...lDateHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../JavaSqlDateHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javasql/javasqldate/jdo/JavaSqlDateJdo.java | 12 +--
.../javasql/javasqldate/jpa/JavaSqlDateJpa.java | 12 +--
.../javasqldate/persistence/JavaSqlDateEntity.java | 2 +-
.../javasql/javasqldate/vm/JavaSqlDateVm.java | 14 ++--
.../javasqltimestamp/JavaSqlTimestamps.java | 20 ++---
.../holder/JavaSqlTimestampHolder.java | 2 +-
.../holder/JavaSqlTimestampHolder2.java | 8 +-
.../holder/JavaSqlTimestampHolder3.java | 10 +--
.../JavaSqlTimestampHolder_actionReturning.java | 4 +-
...lTimestampHolder_actionReturningCollection.java | 4 +-
.../JavaSqlTimestampHolder_mixinProperty.java | 6 +-
...stampHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...aSqlTimestampHolder_updateReadOnlyProperty.java | 10 +--
...mpHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javasqltimestamp/jdo/JavaSqlTimestampJdo.java | 12 +--
.../javasqltimestamp/jpa/JavaSqlTimestampJpa.java | 12 +--
.../persistence/JavaSqlTimestampEntity.java | 2 +-
.../javasqltimestamp/vm/JavaSqlTimestampVm.java | 14 ++--
.../dom/types/javatime/JavaTimeTypesMenu.java | 14 ++--
.../javatimelocaldate/JavaTimeLocalDates.java | 20 ++---
.../holder/JavaTimeLocalDateHolder.java | 2 +-
.../holder/JavaTimeLocalDateHolder2.java | 8 +-
.../holder/JavaTimeLocalDateHolder3.java | 10 +--
.../JavaTimeLocalDateHolder_actionReturning.java | 4 +-
...eLocalDateHolder_actionReturningCollection.java | 4 +-
.../JavaTimeLocalDateHolder_mixinProperty.java | 6 +-
...lDateHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...TimeLocalDateHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeLocalDateJdo.java | 12 +--
.../jpa/JavaTimeLocalDateJpa.java | 12 +--
.../persistence/JavaTimeLocalDateEntity.java | 2 +-
.../javatimelocaldate/vm/JavaTimeLocalDateVm.java | 14 ++--
.../JavaTimeLocalDateTimes.java | 20 ++---
.../holder/JavaTimeLocalDateTimeHolder.java | 2 +-
.../holder/JavaTimeLocalDateTimeHolder2.java | 8 +-
.../holder/JavaTimeLocalDateTimeHolder3.java | 10 +--
...avaTimeLocalDateTimeHolder_actionReturning.java | 4 +-
...alDateTimeHolder_actionReturningCollection.java | 4 +-
.../JavaTimeLocalDateTimeHolder_mixinProperty.java | 6 +-
...eTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...LocalDateTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeLocalDateTimeJdo.java | 12 +--
.../jpa/JavaTimeLocalDateTimeJpa.java | 12 +--
.../persistence/JavaTimeLocalDateTimeEntity.java | 2 +-
.../vm/JavaTimeLocalDateTimeVm.java | 14 ++--
.../javatimelocaltime/JavaTimeLocalTimes.java | 20 ++---
.../holder/JavaTimeLocalTimeHolder.java | 2 +-
.../holder/JavaTimeLocalTimeHolder2.java | 8 +-
.../holder/JavaTimeLocalTimeHolder3.java | 10 +--
.../JavaTimeLocalTimeHolder_actionReturning.java | 4 +-
...eLocalTimeHolder_actionReturningCollection.java | 4 +-
.../JavaTimeLocalTimeHolder_mixinProperty.java | 6 +-
...lTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...TimeLocalTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeLocalTimeJdo.java | 12 +--
.../jpa/JavaTimeLocalTimeJpa.java | 12 +--
.../persistence/JavaTimeLocalTimeEntity.java | 2 +-
.../javatimelocaltime/vm/JavaTimeLocalTimeVm.java | 14 ++--
.../JavaTimeOffsetDateTimes.java | 20 ++---
.../holder/JavaTimeOffsetDateTimeHolder.java | 2 +-
.../holder/JavaTimeOffsetDateTimeHolder2.java | 8 +-
.../holder/JavaTimeOffsetDateTimeHolder3.java | 10 +--
...vaTimeOffsetDateTimeHolder_actionReturning.java | 4 +-
...etDateTimeHolder_actionReturningCollection.java | 4 +-
...JavaTimeOffsetDateTimeHolder_mixinProperty.java | 6 +-
...eTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...ffsetDateTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeOffsetDateTimeJdo.java | 12 +--
.../jpa/JavaTimeOffsetDateTimeJpa.java | 12 +--
.../persistence/JavaTimeOffsetDateTimeEntity.java | 2 +-
.../vm/JavaTimeOffsetDateTimeVm.java | 14 ++--
.../javatimeoffsettime/JavaTimeOffsetTimes.java | 20 ++---
.../holder/JavaTimeOffsetTimeHolder.java | 2 +-
.../holder/JavaTimeOffsetTimeHolder2.java | 8 +-
.../holder/JavaTimeOffsetTimeHolder3.java | 10 +--
.../JavaTimeOffsetTimeHolder_actionReturning.java | 4 +-
...OffsetTimeHolder_actionReturningCollection.java | 4 +-
.../JavaTimeOffsetTimeHolder_mixinProperty.java | 6 +-
...tTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...imeOffsetTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeOffsetTimeJdo.java | 12 +--
.../jpa/JavaTimeOffsetTimeJpa.java | 12 +--
.../persistence/JavaTimeOffsetTimeEntity.java | 2 +-
.../vm/JavaTimeOffsetTimeVm.java | 14 ++--
.../JavaTimeZonedDateTimes.java | 20 ++---
.../holder/JavaTimeZonedDateTimeHolder.java | 2 +-
.../holder/JavaTimeZonedDateTimeHolder2.java | 8 +-
.../holder/JavaTimeZonedDateTimeHolder3.java | 10 +--
...avaTimeZonedDateTimeHolder_actionReturning.java | 4 +-
...edDateTimeHolder_actionReturningCollection.java | 4 +-
.../JavaTimeZonedDateTimeHolder_mixinProperty.java | 6 +-
...eTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...ZonedDateTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JavaTimeZonedDateTimeJdo.java | 12 +--
.../jpa/JavaTimeZonedDateTimeJpa.java | 12 +--
.../persistence/JavaTimeZonedDateTimeEntity.java | 2 +-
.../vm/JavaTimeZonedDateTimeVm.java | 14 ++--
.../dom/types/javautil/JavaUtilTypesMenu.java | 14 ++--
.../types/javautil/javautildate/JavaUtilDates.java | 20 ++---
.../javautildate/holder/JavaUtilDateHolder.java | 2 +-
.../javautildate/holder/JavaUtilDateHolder2.java | 8 +-
.../javautildate/holder/JavaUtilDateHolder3.java | 10 +--
.../holder/JavaUtilDateHolder_actionReturning.java | 4 +-
...vaUtilDateHolder_actionReturningCollection.java | 4 +-
.../holder/JavaUtilDateHolder_mixinProperty.java | 6 +-
...lDateHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../JavaUtilDateHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../javautil/javautildate/jdo/JavaUtilDateJdo.java | 12 +--
.../javautil/javautildate/jpa/JavaUtilDateJpa.java | 12 +--
.../persistence/JavaUtilDateEntity.java | 2 +-
.../javautil/javautildate/vm/JavaUtilDateVm.java | 14 ++--
.../dom/types/javautil/uuids/JavaUtilUuids.java | 20 ++---
.../javautil/uuids/holder/JavaUtilUuidHolder.java | 2 +-
.../javautil/uuids/holder/JavaUtilUuidHolder2.java | 8 +-
.../holder/JavaUtilUuidHolder_actionReturning.java | 4 +-
...vaUtilUuidHolder_actionReturningCollection.java | 4 +-
.../holder/JavaUtilUuidHolder_mixinProperty.java | 6 +-
...lUuidHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../JavaUtilUuidHolder_updateReadOnlyProperty.java | 10 +--
...idHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/javautil/uuids/jdo/JavaUtilUuidJdo.java | 12 +--
.../types/javautil/uuids/jpa/JavaUtilUuidJpa.java | 12 +--
.../uuids/persistence/JavaUtilUuidEntity.java | 2 +-
.../types/javautil/uuids/vm/JavaUtilUuidVm.java | 14 ++--
.../dom/types/jodatime/JodaTimeTypesMenu.java | 16 ++--
.../types/jodatime/jodadatetime/JodaDateTimes.java | 20 ++---
.../jodadatetime/holder/JodaDateTimeHolder.java | 2 +-
.../jodadatetime/holder/JodaDateTimeHolder2.java | 8 +-
.../jodadatetime/holder/JodaDateTimeHolder3.java | 10 +--
.../holder/JodaDateTimeHolder_actionReturning.java | 4 +-
...daDateTimeHolder_actionReturningCollection.java | 4 +-
.../holder/JodaDateTimeHolder_mixinProperty.java | 6 +-
...eTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
.../JodaDateTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jodatime/jodadatetime/jdo/JodaDateTimeJdo.java | 12 +--
.../persistence/JodaDateTimeEntity.java | 2 +-
.../jodatime/jodadatetime/vm/JodaDateTimeVm.java | 14 ++--
.../jodatime/jodalocaldate/JodaLocalDates.java | 20 ++---
.../jodalocaldate/holder/JodaLocalDateHolder.java | 2 +-
.../jodalocaldate/holder/JodaLocalDateHolder2.java | 8 +-
.../jodalocaldate/holder/JodaLocalDateHolder3.java | 10 +--
.../JodaLocalDateHolder_actionReturning.java | 4 +-
...aLocalDateHolder_actionReturningCollection.java | 4 +-
.../holder/JodaLocalDateHolder_mixinProperty.java | 6 +-
...lDateHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...JodaLocalDateHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jodalocaldate/jdo/JodaLocalDateJdo.java | 12 +--
.../persistence/JodaLocalDateEntity.java | 2 +-
.../jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 14 ++--
.../jodalocaldatetime/JodaLocalDateTimes.java | 20 ++---
.../holder/JodaLocalDateTimeHolder.java | 2 +-
.../holder/JodaLocalDateTimeHolder2.java | 8 +-
.../holder/JodaLocalDateTimeHolder3.java | 10 +--
.../JodaLocalDateTimeHolder_actionReturning.java | 4 +-
...alDateTimeHolder_actionReturningCollection.java | 4 +-
.../JodaLocalDateTimeHolder_mixinProperty.java | 6 +-
...eTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...LocalDateTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jdo/JodaLocalDateTimeJdo.java | 12 +--
.../persistence/JodaLocalDateTimeEntity.java | 2 +-
.../jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 14 ++--
.../jodatime/jodalocaltime/JodaLocalTimes.java | 20 ++---
.../jodalocaltime/holder/JodaLocalTimeHolder.java | 2 +-
.../jodalocaltime/holder/JodaLocalTimeHolder2.java | 8 +-
.../JodaLocalTimeHolder_actionReturning.java | 4 +-
...aLocalTimeHolder_actionReturningCollection.java | 4 +-
.../holder/JodaLocalTimeHolder_mixinProperty.java | 6 +-
...lTimeHolder_updateReadOnlyOptionalProperty.java | 14 ++--
...JodaLocalTimeHolder_updateReadOnlyProperty.java | 10 +--
...meHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../jodalocaltime/jdo/JodaLocalTimeJdo.java | 12 +--
.../persistence/JodaLocalTimeEntity.java | 2 +-
.../jodatime/jodalocaltime/vm/JodaLocalTimeVm.java | 14 ++--
.../dom/types/primitive/PrimitiveTypesMenu.java | 14 ++--
.../primitive/booleans/PrimitiveBooleans.java | 20 ++---
.../booleans/holder/PrimitiveBooleanHolder.java | 6 +-
.../booleans/holder/PrimitiveBooleanHolder2.java | 8 +-
.../PrimitiveBooleanHolder_actionReturning.java | 4 +-
...rimitiveBooleanHolder_actionReturningArray.java | 4 +-
.../PrimitiveBooleanHolder_mixinProperty.java | 6 +-
...mitiveBooleanHolder_updateReadOnlyProperty.java | 10 +--
...anHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../booleans/jdo/PrimitiveBooleanJdo.java | 10 +--
.../booleans/jpa/PrimitiveBooleanJpa.java | 10 +--
.../persistence/PrimitiveBooleanEntity.java | 2 +-
.../primitive/booleans/vm/PrimitiveBooleanVm.java | 12 +--
.../dom/types/primitive/bytes/PrimitiveBytes.java | 20 ++---
.../bytes/holder/PrimitiveByteHolder.java | 2 +-
.../bytes/holder/PrimitiveByteHolder2.java | 8 +-
.../PrimitiveByteHolder_actionReturning.java | 4 +-
.../PrimitiveByteHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveByteHolder_mixinProperty.java | 6 +-
...PrimitiveByteHolder_updateReadOnlyProperty.java | 10 +--
...teHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/bytes/jdo/PrimitiveByteJdo.java | 10 +--
.../primitive/bytes/jpa/PrimitiveByteJpa.java | 10 +--
.../bytes/persistence/PrimitiveByteEntity.java | 2 +-
.../types/primitive/bytes/vm/PrimitiveByteVm.java | 12 +--
.../dom/types/primitive/chars/PrimitiveChars.java | 20 ++---
.../chars/holder/PrimitiveCharHolder.java | 2 +-
.../chars/holder/PrimitiveCharHolder2.java | 8 +-
.../PrimitiveCharHolder_actionReturning.java | 4 +-
.../PrimitiveCharHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveCharHolder_mixinProperty.java | 6 +-
...PrimitiveCharHolder_updateReadOnlyProperty.java | 10 +--
...arHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/chars/jdo/PrimitiveCharJdo.java | 10 +--
.../primitive/chars/jpa/PrimitiveCharJpa.java | 10 +--
.../chars/persistence/PrimitiveCharEntity.java | 2 +-
.../types/primitive/chars/vm/PrimitiveCharVm.java | 12 +--
.../types/primitive/doubles/PrimitiveDoubles.java | 20 ++---
.../doubles/holder/PrimitiveDoubleHolder.java | 2 +-
.../doubles/holder/PrimitiveDoubleHolder2.java | 8 +-
.../PrimitiveDoubleHolder_actionReturning.java | 4 +-
...PrimitiveDoubleHolder_actionReturningArray.java | 4 +-
.../PrimitiveDoubleHolder_mixinProperty.java | 6 +-
...imitiveDoubleHolder_updateReadOnlyProperty.java | 10 +--
...leHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/doubles/jdo/PrimitiveDoubleJdo.java | 10 +--
.../primitive/doubles/jpa/PrimitiveDoubleJpa.java | 10 +--
.../doubles/persistence/PrimitiveDoubleEntity.java | 2 +-
.../primitive/doubles/vm/PrimitiveDoubleVm.java | 12 +--
.../types/primitive/floats/PrimitiveFloats.java | 20 ++---
.../floats/holder/PrimitiveFloatHolder.java | 2 +-
.../floats/holder/PrimitiveFloatHolder2.java | 8 +-
.../PrimitiveFloatHolder_actionReturning.java | 4 +-
.../PrimitiveFloatHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveFloatHolder_mixinProperty.java | 6 +-
...rimitiveFloatHolder_updateReadOnlyProperty.java | 10 +--
...atHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/floats/jdo/PrimitiveFloatJdo.java | 10 +--
.../primitive/floats/jpa/PrimitiveFloatJpa.java | 10 +--
.../floats/persistence/PrimitiveFloatEntity.java | 2 +-
.../primitive/floats/vm/PrimitiveFloatVm.java | 12 +--
.../dom/types/primitive/ints/PrimitiveInts.java | 20 ++---
.../primitive/ints/holder/PrimitiveIntHolder.java | 2 +-
.../primitive/ints/holder/PrimitiveIntHolder2.java | 8 +-
.../holder/PrimitiveIntHolder_actionReturning.java | 4 +-
.../PrimitiveIntHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveIntHolder_mixinProperty.java | 6 +-
.../PrimitiveIntHolder_updateReadOnlyProperty.java | 10 +--
...ntHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../types/primitive/ints/jdo/PrimitiveIntJdo.java | 10 +--
.../types/primitive/ints/jpa/PrimitiveIntJpa.java | 10 +--
.../ints/persistence/PrimitiveIntEntity.java | 2 +-
.../types/primitive/ints/vm/PrimitiveIntVm.java | 12 +--
.../dom/types/primitive/longs/PrimitiveLongs.java | 20 ++---
.../longs/holder/PrimitiveLongHolder.java | 2 +-
.../longs/holder/PrimitiveLongHolder2.java | 8 +-
.../PrimitiveLongHolder_actionReturning.java | 4 +-
.../PrimitiveLongHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveLongHolder_mixinProperty.java | 6 +-
...PrimitiveLongHolder_updateReadOnlyProperty.java | 10 +--
...ngHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/longs/jdo/PrimitiveLongJdo.java | 10 +--
.../primitive/longs/jpa/PrimitiveLongJpa.java | 10 +--
.../longs/persistence/PrimitiveLongEntity.java | 2 +-
.../types/primitive/longs/vm/PrimitiveLongVm.java | 12 +--
.../types/primitive/shorts/PrimitiveShorts.java | 20 ++---
.../shorts/holder/PrimitiveShortHolder.java | 2 +-
.../shorts/holder/PrimitiveShortHolder2.java | 8 +-
.../PrimitiveShortHolder_actionReturning.java | 4 +-
.../PrimitiveShortHolder_actionReturningArray.java | 4 +-
.../holder/PrimitiveShortHolder_mixinProperty.java | 6 +-
...rimitiveShortHolder_updateReadOnlyProperty.java | 10 +--
...rtHolder_updateReadOnlyPropertyWithChoices.java | 10 +--
.../primitive/shorts/jdo/PrimitiveShortJdo.java | 10 +--
.../primitive/shorts/jpa/PrimitiveShortJpa.java | 10 +--
.../shorts/persistence/PrimitiveShortEntity.java | 2 +-
.../primitive/shorts/vm/PrimitiveShortVm.java | 12 +--
.../java/demoapp/web/linebreaker/LineBreaker.java | 10 +--
.../demoapp/web/replay/DemoReplayController.java | 12 +--
.../PrototypeActionsVisibilityAdvisor.java | 16 ++--
.../ui/custom/WhereInTheWorldPanelFactory.java | 2 +-
.../commandlog/jdo/CommandSubscriberForJdo.java | 2 +-
.../commandlog/jdo/entities/CommandJdo.java | 18 ++---
.../jdo/entities/CommandJdoRepository.java | 4 +-
.../jdo/entities/CommandJdo_childCommands.java | 4 +-
.../jdo/entities/CommandJdo_openResultObject.java | 6 +-
.../jdo/entities/CommandJdo_openTargetObject.java | 6 +-
.../commandlog/jdo/entities/CommandJdo_retry.java | 8 +-
.../jdo/entities/CommandJdo_siblingCommands.java | 4 +-
.../jdo/mixins/HasInteractionId_command.java | 6 +-
.../mixins/HasUsername_recentCommandsByUser.java | 4 +-
.../jdo/mixins/Object_recentCommands.java | 12 +--
.../extensions/commandlog/jdo/mixins/T_recent.java | 4 +-
.../commandlog/jdo/ui/CommandServiceMenu.java | 26 +++----
.../commandlog/jpa/entities/CommandJpa.java | 18 ++---
.../jpa/entities/CommandJpaRepository.java | 4 +-
.../primary/config/PrimaryConfig.java | 2 +-
.../primary/mixins/Object_openOnSecondary.java | 12 +--
.../primary/restapi/CommandRetrievalService.java | 2 +-
.../primary/spiimpl/CaptureResultOfCommand.java | 2 +-
.../primary/ui/CommandReplayOnPrimaryService.java | 18 ++---
.../analyser/CommandReplayAnalyserException.java | 2 +-
.../analyser/CommandReplayAnalyserResult.java | 2 +-
.../analysis/CommandReplayAnalysisService.java | 2 +-
.../secondary/config/SecondaryConfig.java | 2 +-
.../secondary/fetch/CommandFetcher.java | 2 +-
.../secondary/mixins/CommandJdo_replayQueue.java | 4 +-
.../secondary/mixins/CommandModel_exclude.java | 6 +-
.../secondary/mixins/Object_openOnPrimary.java | 10 +--
.../ui/CommandReplayOnSecondaryService.java | 2 +-
.../feature/api/ApplicationFeatureChoices.java | 10 +--
.../ApplicationFeatureViewModel_permissions.java | 6 +-
.../app/ApplicationOrphanedPermissionManager.java | 8 +-
...OrphanedPermissionManager_relocateSelected.java | 12 +--
.../permission/dom/ApplicationPermission.java | 14 ++--
.../permission/dom/ApplicationPermissionValue.java | 2 +-
.../dom/ApplicationPermissionValueSet.java | 2 +-
.../dom/mixins/ApplicationPermission_allow.java | 8 +-
.../dom/mixins/ApplicationPermission_changing.java | 8 +-
.../dom/mixins/ApplicationPermission_delete.java | 8 +-
.../dom/mixins/ApplicationPermission_feature.java | 8 +-
.../mixins/ApplicationPermission_updateRole.java | 10 +--
.../dom/mixins/ApplicationPermission_veto.java | 8 +-
.../dom/mixins/ApplicationPermission_viewing.java | 8 +-
.../permission/menu/ApplicationPermissionMenu.java | 20 ++---
.../secman/applib/role/dom/ApplicationRole.java | 20 ++---
.../dom/mixins/ApplicationRole_addPermission.java | 14 ++--
.../role/dom/mixins/ApplicationRole_addUser.java | 8 +-
.../role/dom/mixins/ApplicationRole_delete.java | 8 +-
.../mixins/ApplicationRole_removePermissions.java | 10 +--
.../dom/mixins/ApplicationRole_removeUsers.java | 10 +--
.../mixins/ApplicationRole_updateDescription.java | 10 +--
.../dom/mixins/ApplicationRole_updateName.java | 10 +--
.../applib/role/menu/ApplicationRoleMenu.java | 24 +++---
.../applib/seed/SeedSecurityModuleService.java | 2 +-
.../applib/tenancy/dom/ApplicationTenancy.java | 20 ++---
.../dom/mixins/ApplicationTenancy_addChild.java | 8 +-
.../dom/mixins/ApplicationTenancy_addUser.java | 8 +-
.../dom/mixins/ApplicationTenancy_delete.java | 8 +-
.../dom/mixins/ApplicationTenancy_removeChild.java | 8 +-
.../dom/mixins/ApplicationTenancy_removeUser.java | 8 +-
.../dom/mixins/ApplicationTenancy_updateName.java | 10 +--
.../dom/mixins/ApplicationTenancy_users.java | 6 +-
.../tenancy/menu/ApplicationTenancyMenu.java | 28 +++----
.../applib/user/app/ApplicationUserManager.java | 6 +-
.../mixins/ApplicationUserManager_allUsers.java | 4 +-
.../ApplicationUserManager_newDelegateUser.java | 12 +--
.../ApplicationUserManager_newLocalUser.java | 12 +--
.../user/contributions/HasUsername_open.java | 8 +-
.../secman/applib/user/dom/ApplicationUser.java | 26 +++----
.../user/dom/mixins/ApplicationUser_addRole.java | 8 +-
.../user/dom/mixins/ApplicationUser_delete.java | 8 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 8 +-
.../user/dom/mixins/ApplicationUser_lock.java | 8 +-
.../dom/mixins/ApplicationUser_removeRoles.java | 8 +-
.../dom/mixins/ApplicationUser_resetPassword.java | 8 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 8 +-
.../mixins/ApplicationUser_updateAccountType.java | 10 +--
.../dom/mixins/ApplicationUser_updateAtPath.java | 10 +--
.../mixins/ApplicationUser_updateEmailAddress.java | 10 +--
.../mixins/ApplicationUser_updateFaxNumber.java | 10 +--
.../dom/mixins/ApplicationUser_updateLocale.java | 10 +--
.../dom/mixins/ApplicationUser_updateName.java | 10 +--
.../dom/mixins/ApplicationUser_updatePassword.java | 8 +-
.../mixins/ApplicationUser_updatePhoneNumber.java | 10 +--
.../dom/mixins/ApplicationUser_updateUsername.java | 10 +--
...ApplicationUser_effectiveMemberPermissions.java | 6 +-
...ationUser_filterEffectiveMemberPermissions.java | 14 ++--
.../dom/mixins/perms/UserPermissionViewModel.java | 20 ++---
.../applib/user/menu/ApplicationUserMenu.java | 20 ++---
.../secman/applib/user/menu/MeService.java | 20 ++---
.../secman/applib/mmm/dom/ChaseCatsService.java | 4 +-
.../secman/applib/mmm/dom/EatCheeseService.java | 4 +-
.../applib/mmm/dom/PressLiftButtonService.java | 4 +-
.../secman/applib/mmm/dom/RideLiftService.java | 4 +-
.../services/PasswordEncoderUsingJBcrypt.java | 2 +-
.../AuthenticatorSecmanAutoConfiguration.java | 2 +-
.../integration/authorizor/AuthorizorSecman.java | 4 +-
.../PermissionsEvaluationServiceForSecman.java | 2 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 4 +-
.../TableColumnVisibilityServiceForSecman.java | 2 +-
.../userreg/UserRegistrationServiceForSecman.java | 2 +-
.../jdo/permission/dom/ApplicationPermission.java | 8 +-
.../secman/jdo/role/dom/ApplicationRole.java | 8 +-
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 6 +-
.../secman/jdo/user/dom/ApplicationUser.java | 6 +-
.../jpa/permission/dom/ApplicationPermission.java | 8 +-
.../secman/jpa/role/dom/ApplicationRole.java | 8 +-
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 6 +-
.../secman/jpa/user/dom/ApplicationUser.java | 6 +-
...thenticationConverterOfOAuth2UserPrincipal.java | 2 +-
.../extensions/cors/impl/IsisModuleExtCors.java | 2 +-
.../fullcalendar/applib/value/CalendarEvent.java | 2 +-
.../value/CalendarEventSemanticsProvider.java | 12 +--
...alendarableCollectionAsFullCalendarFactory.java | 2 +-
...arEventableCollectionAsFullCalendarFactory.java | 2 +-
.../pdfjs/applib/spi/PdfJsViewerAdvisor.java | 2 +-
.../ui/components/ScalarPanelAbstractLegacy.java | 8 +-
.../javafx/ui/components/UiComponentFactoryFx.java | 2 +-
.../ui/components/collections/TableViewFx.java | 2 +-
.../viewer/javafx/ui/components/form/FormPane.java | 2 +-
.../ui/components/markup/MarkupFieldFactory.java | 2 +-
.../ui/components/number/NumberFieldFactory.java | 2 +-
.../javafx/ui/components/object/ObjectViewFx.java | 2 +-
.../objectref/ObjectReferenceFieldFactory.java | 2 +-
.../ui/components/other/FallbackFieldFactory.java | 2 +-
.../components/temporal/TemporalFieldFactory.java | 2 +-
.../ui/components/text/TextFieldFactory.java | 2 +-
.../viewer/javafx/ui/main/MainViewFx.java | 2 +-
.../ui/components/blob/BlobFieldFactory.java | 2 +-
.../ui/components/clob/ClobFieldFactory.java | 2 +-
.../ui/components/collection/TableViewVaa.java | 2 +-
.../ui/components/markup/MarkupFieldFactory.java | 2 +-
.../vaadin/ui/components/object/ObjectViewVaa.java | 2 +-
.../ui/components/other/FallbackFieldFactory.java | 2 +-
.../components/temporal/TemporalFieldFactory.java | 2 +-
.../ui/components/text/TextFieldFactory.java | 2 +-
.../ui/components/text/uuid/UuidFieldFactory.java | 2 +-
.../viewer/vaadin/ui/pages/main/MainViewVaa.java | 2 +-
.../persistence/jdo/applib/types/AddressLine.java | 10 +--
.../persistence/jdo/applib/types/Description.java | 10 +--
.../isis/persistence/jdo/applib/types/Email.java | 10 +--
.../isis/persistence/jdo/applib/types/Fqcn.java | 10 +--
.../jdo/applib/types/LogicalTypeName.java | 14 ++--
.../isis/persistence/jdo/applib/types/Money.java | 10 +--
.../isis/persistence/jdo/applib/types/Name.java | 10 +--
.../isis/persistence/jdo/applib/types/Notes.java | 10 +--
.../jdo/applib/types/ObjectIdentifier.java | 14 ++--
.../persistence/jdo/applib/types/Percentage.java | 10 +--
.../persistence/jdo/applib/types/PhoneNumber.java | 10 +--
.../persistence/jdo/applib/types/PostalCode.java | 10 +--
.../persistence/jdo/applib/types/ProperName.java | 10 +--
.../persistence/jdo/applib/types/Reference.java | 10 +--
.../isis/persistence/jdo/applib/types/Title.java | 10 +--
.../persistence/jdo/applib/types/UrlTemplate.java | 10 +--
.../persistence/jdo/applib/types/Username.java | 10 +--
.../jdo/datanucleus/config/DnSettings.java | 2 +-
.../jdosupport/JdoSupportServiceDefault.java | 2 +-
.../mixins/Persistable_datanucleusVersionLong.java | 8 +-
.../Persistable_datanucleusVersionTimestamp.java | 8 +-
.../mixins/Persistable_downloadJdoMetadata.java | 14 ++--
.../changetracking/EntityChangeTrackerJdo.java | 6 +-
.../changetracking/_ChangingEntitiesFactory.java | 2 +-
.../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 2 +-
.../DisabledFacetFromJdoPrimaryKeyAnnotation.java | 2 +-
.../jdo/metamodel/menu/JdoMetamodelMenu.java | 16 ++--
.../jpa/eclipselink/config/ElSettings.java | 2 +-
.../PersistenceMetricsServiceJpa.java | 2 +-
.../testdomain/rest/DomainObjectResourceTest.java | 2 +-
.../isis/testdomain/rest/MenuBarsResourceTest.java | 2 +-
.../SpringServiceInjectPriorityTest.java | 4 +-
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../domainmodel/DomainModelTest_forEditing.java | 18 ++---
.../DomainModelTest_usingBadDomain.java | 12 +--
.../DomainModelTest_usingGoodDomain.java | 4 +-
.../testdomain/factory/ViewModelFactoryTest.java | 4 +-
.../testdomain/interact/ActionInteractionTest.java | 2 +-
.../interact/CollectionInteractionTest.java | 2 +-
.../testdomain/interact/CommandArgumentTest.java | 8 +-
.../testdomain/interact/NewParameterModelTest.java | 2 +-
.../testdomain/interact/PropertyBindingTest.java | 2 +-
.../interact/PropertyInteractionTest.java | 4 +-
.../interact/ScalarParamNegotiationTest.java | 2 +-
.../interact/WrapperInteractionTest.java | 6 +-
.../interact/WrapperInteractionTest2.java | 6 +-
.../interact/WrapperInteractionTest3.java | 10 +--
.../interact/WrapperInteractionTest4.java | 10 +--
.../isis/testdomain/value/ValueSemanticsTest.java | 2 +-
.../testdomain/value/ValueSemanticsTester.java | 2 +-
.../viewers/common/wkt/InteractionTestWkt.java | 2 +-
.../testdomain/viewers/jdo/wkt/TestAppJdoWkt.java | 12 +--
.../testdomain/viewers/jdo/wkt/TestAppJpaWkt.java | 12 +--
.../testdomain/conf/Configuration_headless.java | 2 +-
.../isis/testdomain/jdo/JdoInventoryJaxbVm.java | 18 ++---
.../jdo/JdoInventoryJaxbVm_selectBooksForSale.java | 10 +--
.../isis/testdomain/jdo/JdoInventoryManager.java | 8 +-
.../isis/testdomain/jdo/JdoInventoryResource.java | 10 +--
.../isis/testdomain/jdo/entities/JdoBook.java | 8 +-
.../isis/testdomain/jdo/entities/JdoInventory.java | 6 +-
.../isis/testdomain/jdo/entities/JdoProduct.java | 14 ++--
.../testdomain/jdo/entities/JdoProductComment.java | 4 +-
.../isis/testdomain/jpa/JpaInventoryJaxbVm.java | 18 ++---
.../jpa/JpaInventoryJaxbVm_selectBooksForSale.java | 10 +--
.../isis/testdomain/jpa/JpaInventoryManager.java | 6 +-
.../isis/testdomain/jpa/JpaInventoryResource.java | 10 +--
.../isis/testdomain/jpa/entities/JpaBook.java | 8 +-
.../jpa/entities/JpaEntityGeneratedLongId.java | 8 +-
.../entities/JpaEntityNonGeneratedStringId.java | 8 +-
.../isis/testdomain/jpa/entities/JpaInventory.java | 8 +-
.../isis/testdomain/jpa/entities/JpaProduct.java | 14 ++--
.../testdomain/jpa/entities/JpaProductComment.java | 4 +-
.../isis/testdomain/jpa/springdata/Employee.java | 2 +-
.../testdomain/jpa/springdata/EmployeeManager.java | 6 +-
.../springdata/EmployeeManager_deleteEmployee.java | 2 +-
.../springdata/EmployeeManager_newEmployee.java | 4 +-
.../testdomain/model/actnsemantics/BlobDemo.java | 10 +--
.../model/actnsemantics/BlobDemoMenu.java | 12 +--
.../model/bad/AmbiguousMixinAnnotations.java | 16 ++--
.../isis/testdomain/model/bad/AmbiguousTitle.java | 6 +-
.../model/bad/InvalidActionOverloading.java | 6 +-
.../bad/InvalidContradictingTypeSemantics.java | 4 +-
.../model/bad/InvalidDomainObjectOnInterface.java | 4 +-
.../model/bad/InvalidLogicalTypeNameClash.java | 8 +-
.../model/bad/InvalidOrphanedActionSupport.java | 6 +-
.../bad/InvalidOrphanedCollectionSupport.java | 6 +-
.../model/bad/InvalidOrphanedPropertySupport.java | 6 +-
.../bad/InvalidPropertyAnnotationOnAction.java | 8 +-
...dOrphanedActionSupportNoAnnotationEnforced.java | 4 +-
.../testdomain/model/good/ElementTypeAbstract.java | 4 +-
.../testdomain/model/good/ElementTypeConcrete.java | 2 +-
.../model/good/ElementTypeInterface.java | 4 +-
.../isis/testdomain/model/good/MixinConcrete.java | 8 +-
.../ProperActionWithNameStartingWithSetOrGet.java | 8 +-
.../model/good/ProperChoicesWhenChoicesFrom.java | 8 +-
.../testdomain/model/good/ProperElementTypeVm.java | 6 +-
.../testdomain/model/good/ProperFullyAbstract.java | 14 ++--
.../testdomain/model/good/ProperFullyImpl.java | 4 +-
.../testdomain/model/good/ProperGenericImpl.java | 6 +-
.../testdomain/model/good/ProperInterface.java | 4 +-
.../testdomain/model/good/ProperInterface2.java | 4 +-
.../good/ProperLayoutOnPropertyWithLombok.java | 10 +--
.../good/ProperMemberInheritanceAbstract.java | 14 ++--
.../good/ProperMemberInheritanceInterface.java | 14 ++--
.../ProperMemberInheritance_usingAbstract.java | 12 +--
.../ProperMemberInheritance_usingInterface.java | 12 +--
.../testdomain/model/good/ProperMemberSupport.java | 18 ++---
.../model/good/ProperMemberSupport_action.java | 10 +--
.../model/good/ProperMemberSupport_action2.java | 8 +-
.../model/good/ProperMemberSupport_action3.java | 8 +-
.../model/good/ProperMemberSupport_action4.java | 8 +-
.../model/good/ProperMemberSupport_action5.java | 6 +-
.../model/good/ProperMemberSupport_collection.java | 6 +-
.../good/ProperMemberSupport_collection2.java | 6 +-
.../good/ProperMemberSupport_collection3.java | 6 +-
.../model/good/ProperMemberSupport_property.java | 8 +-
.../model/good/ProperMemberSupport_property2.java | 8 +-
.../model/good/ProperMemberSupport_property3.java | 6 +-
.../model/good/ProperParameterSupport.java | 8 +-
.../model/good/ProperPrefixedAction.java | 6 +-
.../model/good/ProperPrefixedMember.java | 10 +--
.../model/good/ProperServiceWithMixin.java | 8 +-
...lWithAnnotationOptionalUsingPrivateSupport.java | 18 ++---
.../good/ViewModelWithEncapsulatedMembers.java | 14 ++--
.../model/interaction/InteractionDemo.java | 22 +++---
.../model/interaction/InteractionDemoItem.java | 14 ++--
.../interaction/InteractionDemo_biArgDisabled.java | 4 +-
.../interaction/InteractionDemo_biArgEnabled.java | 4 +-
.../InteractionDemo_biListOfString.java | 4 +-
.../interaction/InteractionDemo_multiEnum.java | 4 +-
.../interaction/InteractionDemo_multiInt.java | 4 +-
.../interaction/InteractionDemo_negotiate.java | 4 +-
.../interaction/InteractionDemo_noArgDisabled.java | 4 +-
.../interaction/InteractionDemo_noArgEnabled.java | 4 +-
.../model/interaction/InteractionNpmDemo.java | 6 +-
.../InteractionNpmDemo_biArgDisabled.java | 4 +-
.../InteractionNpmDemo_biArgEnabled.java | 8 +-
.../isis/testdomain/model/layout/LayoutDemo.java | 10 +--
.../testdomain/model/stereotypes/MyObject.java | 4 +-
.../model/stereotypes/MyObject_mixin.java | 2 +-
.../testdomain/model/stereotypes/MyService.java | 2 +-
.../isis/testdomain/model/stereotypes/MyView.java | 4 +-
.../model/valuetypes/ValueTypeExample.java | 12 +--
.../publishing/PublishingTestFactoryJdo.java | 2 +-
.../publishing/PublishingTestFactoryJpa.java | 2 +-
.../apache/isis/testdomain/rospec/Customer.java | 4 +-
.../isis/testdomain/rospec/RoSpecSampler.java | 10 +--
.../apache/isis/testdomain/util/dto/BookDto.java | 2 +-
.../interaction/DomainObjectTesterFactory.java | 2 +-
.../util/interaction/InteractionBoundaryProbe.java | 2 +-
.../util/interaction/InteractionTestAbstract.java | 2 +-
.../bypass/authentication/AuthenticatorBypass.java | 2 +-
.../bypass/authorization/AuthorizorBypass.java | 2 +-
.../shiro/authentication/AuthenticatorShiro.java | 2 +-
.../shiro/authorization/AuthorizorShiro.java | 2 +-
.../security/shiro/webmodule/WebModuleShiro.java | 2 +-
...nticationConverterOfAuthenticatedPrincipal.java | 2 +-
.../AuthenticationConverterOfStringPrincipal.java | 2 +-
...henticationConverterOfUserDetailsPrincipal.java | 2 +-
.../spring/authentication/AuthenticatorSpring.java | 2 +-
.../spring/webmodule/WebModuleSpringSecurity.java | 2 +-
.../isis/subdomains/base/applib/Chained.java | 8 +-
.../apache/isis/subdomains/base/applib/Dflt.java | 2 +-
.../services/calendar/CalendarServiceDefault.java | 2 +-
.../subdomains/base/applib/types/AddressLine.java | 10 +--
.../subdomains/base/applib/types/Description.java | 10 +--
.../isis/subdomains/base/applib/types/Email.java | 10 +--
.../isis/subdomains/base/applib/types/Fqcn.java | 10 +--
.../base/applib/types/LogicalTypeName.java | 14 ++--
.../isis/subdomains/base/applib/types/Money.java | 10 +--
.../isis/subdomains/base/applib/types/Name.java | 10 +--
.../isis/subdomains/base/applib/types/Notes.java | 10 +--
.../base/applib/types/ObjectIdentifier.java | 14 ++--
.../subdomains/base/applib/types/Percentage.java | 10 +--
.../subdomains/base/applib/types/PhoneNumber.java | 10 +--
.../subdomains/base/applib/types/PostalCode.java | 10 +--
.../subdomains/base/applib/types/ProperName.java | 10 +--
.../subdomains/base/applib/types/Reference.java | 10 +--
.../isis/subdomains/base/applib/types/Title.java | 10 +--
.../subdomains/base/applib/types/UrlTemplate.java | 10 +--
.../subdomains/base/applib/types/Username.java | 10 +--
.../subdomains/base/applib/with/WithInterval.java | 8 +-
.../base/applib/with/WithIntervalContiguous.java | 10 +--
.../base/applib/with/WithIntervalMutable.java | 8 +-
.../subdomains/base/applib/with/WithStartDate.java | 4 +-
.../docx/applib/service/DocxServiceDefault.java | 2 +-
.../subdomains/excel/applib/dom/RowHandler.java | 2 +-
.../excel/applib/dom/WorksheetContent.java | 2 +-
.../subdomains/excel/applib/dom/WorksheetSpec.java | 2 +-
.../excel/applib/service/ExcelServiceDefault.java | 2 +-
.../excel/applib/service/_ExcelConverter.java | 2 +-
.../contributions/ExcelDemoToDoItem_export.java | 2 +-
.../contributions/ExcelDemoToDoItem_export2.java | 2 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 12 +--
.../BulkUpdateManagerForDemoToDoItem.java | 24 +++---
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 14 ++--
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 4 +-
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 12 +--
.../demotodoitem/DemoToDoItemRowHandler.java | 4 +-
.../demotodoitem/DemoToDoItemRowHandler2.java | 4 +-
.../ExcelUploadRowHandler4ToDoItem.java | 4 +-
.../ExcelUploadServiceForDemoToDoItem.java | 14 ++--
.../DemoFixture_extending_ExcelFixture2.java | 2 +-
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 22 +++---
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 20 ++---
.../subdomains/excel/testing/ExcelFixture.java | 6 +-
.../subdomains/excel/testing/ExcelFixture2.java | 4 +-
.../spring/applib/service/SpringBeansService.java | 2 +-
.../applib/service/XDocReportServiceDefault.java | 2 +-
.../zip/applib/service/ZipServiceDefault.java | 2 +-
.../applib/classrules/ArchitectureDomainRules.java | 16 ++--
.../applib/classrules/ArchitectureJdoRules.java | 4 +-
.../applib/classrules/ArchitectureJpaRules.java | 4 +-
.../applib/classrules/CommonPredicates.java | 4 +-
.../applib/domain/dom/ChamberOfCommerceCode.java | 10 +--
.../applib/domain/dom/SerializableViewModel.java | 6 +-
.../applib/domain/dom/SomeDomainObject.java | 4 +-
.../domain/dom/SomeDomainObject_actionMixin.java | 2 +-
.../dom/SomeDomainObject_collectionMixin.java | 2 +-
.../domain/dom/SomeDomainObject_propertyMixin.java | 2 +-
.../applib/domain/dom/SomeDomainService.java | 4 +-
.../applib/entity/jdo/dom/JdoEntity.java | 4 +-
.../applib/entity/jdo/dom/JdoEntity2.java | 4 +-
.../applib/entity/jdo/dom/JdoEntitySubtype.java | 4 +-
.../applib/entity/jpa/dom/JpaEntity.java | 4 +-
.../applib/entity/jpa/dom/JpaEntity2.java | 4 +-
.../fakedata/applib/services/BigIntegers.java | 2 +-
.../fakedata/applib/services/Collections.java | 2 +-
.../testing/fakedata/applib/services/Enums.java | 2 +-
.../fakedata/applib/services/FakeDataService.java | 2 +-
.../testing/fakedata/applib/services/Strings.java | 2 +-
.../testing/fakedata/applib/services/Urls.java | 2 +-
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 22 +++---
.../dom/FakeDataDemoObjectWithAllMenu.java | 16 ++--
.../FakeDataDemoObjectWithAll_create3.java | 2 +-
...eDataDemoObjectWithAll_create_withFakeData.java | 2 +-
...eDataDemoObjectWithAll_update_withFakeData.java | 2 +-
...xecutionParametersServiceAutoConfiguration.java | 2 +-
.../applib/fixturescripts/FixtureResult.java | 16 ++--
.../applib/fixturescripts/FixtureScript.java | 2 +-
.../FixtureScriptWithExecutionStrategy.java | 2 +-
.../applib/fixturescripts/FixtureScripts.java | 26 +++----
.../FixtureScriptsSpecification.java | 2 +-
.../FixtureScriptsSpecificationProvider.java | 2 +-
...iptsSpecificationProviderAutoConfiguration.java | 2 +-
.../applib/modules/ModuleWithFixturesService.java | 2 +-
.../applib/personas/BuilderScriptAbstract.java | 2 +-
.../applib/personas/BuilderScriptWithResult.java | 2 +-
.../QueryResultsCacheControlForFixtures.java | 2 +-
.../services/InitialFixtureScriptsInstaller.java | 2 +-
.../applib/setup/PersonaEnumPersistAll.java | 2 +-
.../teardown/jdo/TeardownFixtureJdoAbstract.java | 2 +-
.../h2console/ui/services/H2ManagerMenu.java | 18 ++---
.../h2console/ui/webmodule/WebModuleH2Console.java | 2 +-
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 16 ++--
.../applib/IsisIntegrationTestAbstract.java | 2 +-
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 2 +-
.../ChangesDtoValueSemanticsPrettyRender.java | 2 +-
.../CommandDtoValueSemanticsPrettyRender.java | 2 +-
.../InteractionDtoValueSemanticsPrettyRender.java | 2 +-
.../ui/vaa/components/AsciiDocFieldFactoryVaa.java | 2 +-
.../valuetypes/markdown/applib/value/Markdown.java | 2 +-
.../sse/ui/wkt/services/SseServiceDefault.java | 2 +-
.../wkt/webmodule/WebModuleServerSentEvents.java | 2 +-
.../common/applib/mixins/Object_impersonate.java | 14 ++--
.../applib/mixins/Object_impersonateWithRoles.java | 14 ++--
.../services/userprof/UserProfileUiModel.java | 2 +-
.../common/model/action/ActionFormUiModel.java | 2 +-
.../common/model/action/HasManagedAction.java | 4 +-
.../common/model/components/ComponentType.java | 2 +-
.../model/components/UiComponentFactory.java | 2 +-
.../common/model/header/HeaderUiModelProvider.java | 2 +-
.../isis/viewer/common/model/menu/MenuUiModel.java | 2 +-
.../common/model/menu/MenuUiModelProvider.java | 2 +-
.../model/menu/MenuUiModel_buildMenuItems.java | 2 +-
.../viewer/common/model/object/ObjectUiModel.java | 2 +-
.../UserProfileUiModelProviderDefault.java | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../restfulobjects/rendering/IResourceContext.java | 2 +-
.../AbstractObjectMemberReprRenderer.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 2 +-
.../rendering/domainobjects/InvokeKeys.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../ObjectCollectionReprRenderer.java | 2 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 2 +-
.../rendering/service/RepresentationService.java | 2 +-
.../acceptheader/AcceptHeaderServiceForRest.java | 4 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV2.java | 2 +-
.../ContentNegotiationServiceXRoDomainType.java | 2 +-
.../service/swagger/SwaggerServiceDefault.java | 2 +-
.../service/swagger/SwaggerServiceMenu.java | 20 ++---
.../service/swagger/internal/Generation.java | 2 +-
.../rendering/service/swagger/internal/Tagger.java | 2 +-
.../service/swagger/internal/TaggerDefault.java | 2 +-
.../viewer/context/ResourceContext.java | 2 +-
.../mappers/ExceptionMapperForObjectNotFound.java | 2 +-
...xceptionMapperForRestfulObjectsApplication.java | 2 +-
.../ExceptionMapperForRuntimeException.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 2 +-
.../resources/DomainServiceResourceServerside.java | 2 +-
.../resources/DomainTypeResourceServerside.java | 2 +-
.../resources/HomePageResourceServerside.java | 2 +-
.../resources/MenuBarsResourceServerside.java | 2 +-
.../resources/ObjectAdapterAccessHelper.java | 2 +-
.../viewer/resources/ResourceAbstract.java | 2 +-
.../viewer/resources/ResourceDescriptor.java | 2 +-
.../viewer/resources/UserResourceServerside.java | 2 +-
.../resources/VersionResourceServerside.java | 2 +-
.../viewer/resources/_DomainResourceHelper.java | 2 +-
.../wicket/model/isis/WicketViewerSettings.java | 2 +-
.../viewer/wicket/model/links/LinkAndLabel.java | 2 +-
.../viewer/wicket/model/models/ActionModel.java | 2 +-
.../wicket/model/models/ActionModelImpl.java | 2 +-
.../wicket/model/models/ActionPromptProvider.java | 2 +-
.../wicket/model/models/FormExecutorContext.java | 2 +-
.../wicket/model/models/ManagedObjectModel.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../interaction/HasBookmarkedOwnerAbstract.java | 2 +-
.../interaction/act/ActionInteractionWkt.java | 2 +-
.../models/interaction/coll/DataTableModelWkt.java | 2 +-
.../interaction/prop/PropertyInteractionWkt.java | 2 +-
.../entityactions/LinkAndLabelFactory.java | 2 +-
.../serviceactions/ServiceActionsPanelFactory.java | 2 +-
.../serviceactions/TertiaryMenuPanelFactory.java | 2 +-
.../entity/collection/EntityCollectionPanel.java | 2 +-
.../components/entity/fieldset/PropertyGroup.java | 4 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 4 +-
.../components/scalars/primitive/BooleanPanel.java | 2 +-
.../scalars/value/fallback/ValueFallbackPanel.java | 2 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../scalars/jdkdates/JavaSqlDateConverterTest.java | 4 +-
.../jdkdates/JavaUtilDateConverterTest.java | 4 +-
.../scalars/jdkmath/BigDecimalConverterTest.java | 4 +-
.../jodatime/JodaDateTimeConverterTest.java | 4 +-
.../jodatime/JodaLocalDateConverterTest.java | 4 +-
.../jodatime/JodaLocalDateTimeConverterTest.java | 4 +-
.../jodatime/jdk8time/LocalDateConverterTest.java | 4 +-
.../jdk8time/LocalDateTimeConverterTest.java | 4 +-
.../jdk8time/OffsetDateTimeConverterTest.java | 4 +-
.../components/scalars/uuid/UuidConverterTest.java | 4 +-
.../wicket/viewer/mixins/Object_clearHints.java | 8 +-
.../ComponentFactoryRegistrarDefault.java | 2 +-
.../ComponentFactoryRegistryDefault.java | 2 +-
.../registries/pages/PageClassListDefault.java | 2 +-
.../registries/pages/PageClassRegistryDefault.java | 2 +-
.../pages/PageNavigationServiceDefault.java | 2 +-
.../viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../viewer/services/DeepLinkServiceWicket.java | 2 +-
.../services/HintStoreUsingWicketSession.java | 2 +-
.../services/ImageResourceCacheClassPath.java | 2 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../services/WicketViewerSettingsDefault.java | 4 +-
.../wicket/viewer/webmodule/WebModuleWicket.java | 2 +-
1998 files changed, 6806 insertions(+), 6806 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
index 00b12ab..127419a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Indicates that an object belongs to the UI/application layer, and is intended to be used as a view model.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Action.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Action.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 74cc1cc..876b1e2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Action.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/ActionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/ActionLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 4af398a..fece9cd 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/ActionLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -78,8 +78,8 @@ public @interface ActionLayout {
* Whether (and how) this action can be bookmarked in the UI.
*
* <p>
- * For bookmarkable actions, either {@link org.apache.isis.applib.annotations.BookmarkPolicy#AS_ROOT}
- * and {@link org.apache.isis.applib.annotations.BookmarkPolicy#AS_CHILD} can be used (they are treated
+ * For bookmarkable actions, either {@link org.apache.isis.applib.annotation.BookmarkPolicy#AS_ROOT}
+ * and {@link org.apache.isis.applib.annotation.BookmarkPolicy#AS_CHILD} can be used (they are treated
* identically).
* </p>
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/BookmarkPolicy.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/BookmarkPolicy.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
index 6b40bb4..ff32fff 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/BookmarkPolicy.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Bounding.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
similarity index 95%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Bounding.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
index a8a1ba2..e998d43 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Bounding.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Bounding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* Whether the set of instances of a domain object is bounded or not.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Collection.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Collection.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 2c80bdf..06fc695 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Collection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/CollectionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/CollectionLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
index a632232..bfb42ff 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/CollectionLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Domain.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Domain.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Domain.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Domain.java
index d4c82a9..6810201 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Domain.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Domain.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObject.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObject.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index 0b0b3d2..4ea1376 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObject.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -41,7 +41,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
/**
* Domain semantics for domain objects (entities and view models;
- * for services see {@link org.apache.isis.applib.annotations.DomainService}).
+ * for services see {@link org.apache.isis.applib.annotation.DomainService}).
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
* annotated type.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObjectLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObjectLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
index f319b85..5eeeb6d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainObjectLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/DomainService.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 685b382..7d90bbc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainServiceLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/DomainServiceLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
index 81e7718..cd88913 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/DomainServiceLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Editing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Editing.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
index 7777007..614badf 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Editing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* The available policies for editing properties and collections.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/EntityChangeKind.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/EntityChangeKind.java
similarity index 95%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/EntityChangeKind.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/EntityChangeKind.java
index 338fd8e..2c9d512 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/EntityChangeKind.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/EntityChangeKind.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/HomePage.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/HomePage.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
index 15ec978..e8e4533 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/HomePage.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/HomePage.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/InteractionScope.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/InteractionScope.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/InteractionScope.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/InteractionScope.java
index 4490773..a8b2632 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/InteractionScope.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/InteractionScope.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Introspection.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Introspection.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
index c10b721..fb7b223 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Introspection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/LabelPosition.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
similarity index 90%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/LabelPosition.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
index 92b8ea8..2219b82 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/LabelPosition.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
@@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlType;
* The positioning of a label for a property or action parameter.
*
* @since 1.x {@index}
- * @see org.apache.isis.applib.annotations.PropertyLayout
- * @see org.apache.isis.applib.annotations.ParameterLayout
+ * @see org.apache.isis.applib.annotation.PropertyLayout
+ * @see org.apache.isis.applib.annotation.ParameterLayout
*/
@XmlType(
namespace = "http://isis.apache.org/applib/layout/component"
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/LogicalTypeName.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/LogicalTypeName.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
index 437fb51..e7d2f37 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/LogicalTypeName.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/MemberSupport.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MemberSupport.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/MemberSupport.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/MemberSupport.java
index fcc121b..de31d7a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/MemberSupport.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/MemberSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/MinLength.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/MinLength.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
index 918ca9a..b3503fe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/MinLength.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Module.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Module.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
index 209b74a..6d6d2ee 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Module.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Nature.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Nature.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
index b88ca5f..d3ace3d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Nature.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/NatureOfService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/NatureOfService.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
index 413d7c1..3c98b0d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/NatureOfService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* The different sorts of domain services recognized by Isis, as specified in {@link DomainService#nature()}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Navigable.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Navigable.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
index c6abb30..00ed67f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Navigable.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Navigable.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectLifecycle.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectLifecycle.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectLifecycle.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectLifecycle.java
index 05bc803..35a89de 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectLifecycle.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectLifecycle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectSupport.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectSupport.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectSupport.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectSupport.java
index 914bd37..17b5c1c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/ObjectSupport.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ObjectSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Optionality.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Optionality.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
index 3943d88..63f059a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Optionality.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Optionality.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* Whether the property or parameter is optional or is required (aka mandatory).
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Parameter.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Parameter.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
index 1babda8..d2e6347 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Parameter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Parameter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -95,7 +95,7 @@ public @interface Parameter {
* Whether this parameter is optional or is mandatory (ie required).
*
* <p>
- * For parameters the default value, {@link org.apache.isis.applib.annotations.Optionality#DEFAULT}, is taken
+ * For parameters the default value, {@link org.apache.isis.applib.annotation.Optionality#DEFAULT}, is taken
* to mean that the parameter is required.
* </p>
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/ParameterLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/ParameterLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
index 0922254..6732a4a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/ParameterLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ParameterLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/PriorityPrecedence.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PriorityPrecedence.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/PriorityPrecedence.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PriorityPrecedence.java
index f65612d..5a67459 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/PriorityPrecedence.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/PriorityPrecedence.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import org.springframework.core.Ordered;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Programmatic.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Programmatic.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
index 67ad316..15b3ad2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Programmatic.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Programmatic.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Projecting.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Projecting.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
index 6276ddf..1103466 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Projecting.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Projecting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/PromptStyle.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/PromptStyle.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
index 7c87888..2ca00ca 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/PromptStyle.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/PromptStyle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Property.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Property.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index b850ec7..d6d9ebc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Property.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/PropertyLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/PropertyLayout.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
index 2d27953..04664fb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/PropertyLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
* @see Property
*
* @since 1.x {@index}
- * @see org.apache.isis.applib.annotations.ParameterLayout
+ * @see org.apache.isis.applib.annotation.ParameterLayout
*/
@Inherited
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Publishing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Publishing.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
index a5470c6..0a63365 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Publishing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.iactn.Execution;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Redirect.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Redirect.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
index f7aa22f..25df719 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Redirect.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Redirect.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/RenderDay.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/RenderDay.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
index 516f062..aa69872 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/RenderDay.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/RenderDay.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Repainting.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Repainting.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
index 8a8bf1e..992c514 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Repainting.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Repainting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/RestrictTo.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
similarity index 95%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/RestrictTo.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
index 03c91f9..156b09b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/RestrictTo.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/RestrictTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* Whether an action is restricted to development mode, or available in all.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/SemanticsOf.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/SemanticsOf.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
index 30466e2..1d2a077 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/SemanticsOf.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/SemanticsOf.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.util.Enums;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Snapshot.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Snapshot.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Snapshot.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Snapshot.java
index b92ad61..145951e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Snapshot.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Snapshot.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* Whether the property is included if the domain object graph is serialized
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/TimePrecision.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/TimePrecision.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/TimePrecision.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/TimePrecision.java
index c66634f..1c66f5d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/TimePrecision.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/TimePrecision.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
/**
* Precision for time of day.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Title.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Title.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
index 7257716..474a2b3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Title.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Value.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Value.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
index 85e9b8e..c24b0d7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Value.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/ValueSemantics.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/ValueSemantics.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
index 37bceb4..8da1ff4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/ValueSemantics.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
@@ -1,4 +1,4 @@
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/Where.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
similarity index 99%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/Where.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
index eb876ba..4fac7fa 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/Where.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotations/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
similarity index 95%
rename from api/applib/src/main/java/org/apache/isis/applib/annotations/package-info.java
rename to api/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
index 7a8cf2b..6c6509f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotations/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/package-info.java
@@ -20,4 +20,4 @@
/**
*
*/
-package org.apache.isis.applib.annotations;
+package org.apache.isis.applib.annotation;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index b621227..6375d42 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -28,14 +28,14 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Editing;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.ObjectSupport;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.jaxb.PersistentEntitiesAdapter;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
index 11ad4e9..5688e88 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
@@ -20,8 +20,8 @@ package org.apache.isis.applib.events.domain;
import java.util.List;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
@@ -62,7 +62,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.Action#domainEvent()} annotation attribute.
+ * {@link org.apache.isis.applib.annotation.Action#domainEvent()} annotation attribute.
*
* <p>
* Whether this raises an event or not depends upon the
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
index aef506a..3e427dd 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
@@ -40,7 +40,7 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.Collection#domainEvent()}
+ * {@link org.apache.isis.applib.annotation.Collection#domainEvent()}
* annotation attribute.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
index 323112d..ba86bb5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
@@ -54,7 +54,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.Property#domainEvent()}
+ * {@link org.apache.isis.applib.annotation.Property#domainEvent()}
* annotation attribute.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
index 5ee6c80..87bc51d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
@@ -31,7 +31,7 @@ public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#createdLifecycleEvent()}
+ * {@link org.apache.isis.applib.annotation.DomainObject#createdLifecycleEvent()}
* annotation element.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
index 5299b2f..4463f0b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
@@ -27,7 +27,7 @@ public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#loadedLifecycleEvent()}
+ * {@link org.apache.isis.applib.annotation.DomainObject#loadedLifecycleEvent()}
* annotation element.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
index 0a386f7..43f900f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
@@ -33,7 +33,7 @@ public abstract class ObjectPersistedEvent<S> extends AbstractLifecycleEvent<S>
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#persistedLifecycleEvent()} annotation attribute. Whether this
+ * {@link org.apache.isis.applib.annotation.DomainObject#persistedLifecycleEvent()} annotation attribute. Whether this
* raises an event or not depends upon the <tt>isis.core.meta-model.annotation.domain-object.persisted-lifecycle-event.post-for-default</tt>
* configuration property.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
index a29da59..d7518ba 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
@@ -33,7 +33,7 @@ public abstract class ObjectPersistingEvent<S> extends AbstractLifecycleEvent<S>
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#persistingLifecycleEvent()} annotation attribute. Whether this
+ * {@link org.apache.isis.applib.annotation.DomainObject#persistingLifecycleEvent()} annotation attribute. Whether this
* raises an event or not depends upon the <tt>isis.core.meta-model.annotation.domain-object.persisting-lifecycle-event.post-for-default</tt>
* configuration property.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
index 9b2b06e..0ff9995 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
@@ -33,7 +33,7 @@ public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#removingLifecycleEvent()} annotation attribute. Whether this
+ * {@link org.apache.isis.applib.annotation.DomainObject#removingLifecycleEvent()} annotation attribute. Whether this
* raises an event or not depends upon the <tt>isis.core.meta-model.annotation.domain-object.removing-lifecycle-event.post-for-default</tt>
* configuration property.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
index 092af29..860873b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
@@ -30,7 +30,7 @@ public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#updatedLifecycleEvent()} annotation attribute. Whether this
+ * {@link org.apache.isis.applib.annotation.DomainObject#updatedLifecycleEvent()} annotation attribute. Whether this
* raises an event or not depends upon the <tt>isis.core.meta-model.annotation.domain-object.updated-lifecycle-event.post-for-default</tt>
* configuration property.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
index c0ab69c..1c6764d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
@@ -30,7 +30,7 @@ public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObject#updatingLifecycleEvent()} annotation attribute. Whether this
+ * {@link org.apache.isis.applib.annotation.DomainObject#updatingLifecycleEvent()} annotation attribute. Whether this
* raises an event or not depends upon the <tt>isis.core.meta-model.annotation.domain-object.updating-lifecycle-event.post-for-default</tt>
* configuration property.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
index b243f1e..cee48d0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.events.ui;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import lombok.Getter;
@@ -50,7 +50,7 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#cssClassUiEvent()}
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#cssClassUiEvent()}
* annotation element.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
index 42393d2..2173e88 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
@@ -72,7 +72,7 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#iconUiEvent()}
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#iconUiEvent()}
* annotation element.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
index f89b851..610e0c2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.events.ui;
import java.util.EventObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
index c87a340..f8332e7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
@@ -51,7 +51,7 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#titleUiEvent()}
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#titleUiEvent()}
* annotation element.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/graph/SimpleEdge.java b/api/applib/src/main/java/org/apache/isis/applib/graph/SimpleEdge.java
index 7d8e5be..f2ab381 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/graph/SimpleEdge.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/graph/SimpleEdge.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.graph;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeNode.java
index b28521d..5968861 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeNode.java
@@ -30,8 +30,8 @@ import java.util.stream.StreamSupport;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Programmatic;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.graph.Edge;
import org.apache.isis.applib.graph.SimpleEdge;
import org.apache.isis.applib.graph.Vertex;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
index 707c62e..154eb15 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
index 7880dca..3272e10 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
@@ -26,15 +26,15 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.PromptStyle;
-import org.apache.isis.applib.annotations.Redirect;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.Redirect;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
/**
* Describes the layout of a single action, broadly corresponding to
- * {@link org.apache.isis.applib.annotations.ActionLayout}.
+ * {@link org.apache.isis.applib.annotation.ActionLayout}.
*
* @since 1.x {@index}
*/
@@ -180,14 +180,14 @@ HasDescribedAs, HasHidden, HasNamed, HasBookmarking {
this.named = named;
}
- private org.apache.isis.applib.annotations.ActionLayout.Position position;
+ private org.apache.isis.applib.annotation.ActionLayout.Position position;
@XmlAttribute(required = false)
- public org.apache.isis.applib.annotations.ActionLayout.Position getPosition() {
+ public org.apache.isis.applib.annotation.ActionLayout.Position getPosition() {
return position;
}
- public void setPosition(final org.apache.isis.applib.annotations.ActionLayout.Position position) {
+ public void setPosition(final org.apache.isis.applib.annotation.ActionLayout.Position position) {
this.position = position;
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
index c0a45a9..5133b60 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
@@ -28,12 +28,12 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
/**
* Describes the layout of a single collection, broadly corresponds to the
- * {@link org.apache.isis.applib.annotations.CollectionLayout} annotation.
+ * {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
index 97cd3dd..dfecad3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/DomainObjectLayoutData.java
@@ -26,11 +26,11 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.links.Link;
/**
- * Describes the layout of the title and icon of a domain object, broadly corresponding to {@link org.apache.isis.applib.annotations.DomainObjectLayout}.
+ * Describes the layout of the title and icon of a domain object, broadly corresponding to {@link org.apache.isis.applib.annotation.DomainObjectLayout}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
index da920c2..1dd08c6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
index 89e168d..47e5954 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasBookmarking.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.layout.component;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
/**
* @since 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
index f3c3954..4836897 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/HasHidden.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.layout.component;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
/**
* @since 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
index e80350b..fe99e81 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
@@ -28,14 +28,14 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.LabelPosition;
-import org.apache.isis.applib.annotations.PromptStyle;
-import org.apache.isis.applib.annotations.Repainting;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.Repainting;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
/**
- * Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotations.PropertyLayout} annotation.
+ * Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
index f0af34e..b08bfc2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.links.Link;
import lombok.Getter;
@@ -34,7 +34,7 @@ import lombok.Setter;
/**
* Describes the layout of a single action, broadly corresponding to
- * {@link org.apache.isis.applib.annotations.ActionLayout}.
+ * {@link org.apache.isis.applib.annotation.ActionLayout}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
index 3f0b958..0f4b2ba 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/Grid.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.layout.grid;
import java.util.LinkedHashMap;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
index e29fdd3..2f797d1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
index 686c285..125a0fc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
index 1673408..2f2256b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
index 3c40e0b..84a7dec 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3RowContent.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.layout.grid.bootstrap3;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Common superclass for any content of a row.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
index 7bc4f0a..6c4a282 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
index 08e4a2c..de7eaff 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Represents a tab group containing one or more {@link BS3Tab tab}s.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
index 1b4f048..532e9a1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/WithinGrid.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* @since 1.x {@index}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/HasNamed.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/HasNamed.java
index 388958a..4b4d004 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/HasNamed.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/HasNamed.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.layout.menubars;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* @since 1.x {@index}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
index e203069..5e677fc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.commons.internal.collections._Lists;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
index 0745cba..a505c67 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
index 478318e..a13617f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuSection.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.layout.menubars;
import java.util.List;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
index 822f383..20348bc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.Menu;
import lombok.ToString;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
index 2a324fb..7758cef 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
@@ -25,12 +25,12 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.MenuBar;
/**
- * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotations.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
+ * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
index 8f340e4..16aa228 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
@@ -25,12 +25,12 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.commons.internal.exceptions._Exceptions;
/**
- * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.isis.applib.annotations.DomainServiceLayout}.
+ * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.isis.applib.annotation.DomainServiceLayout}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/locale/UserLocale.java b/api/applib/src/main/java/org/apache/isis/applib/locale/UserLocale.java
index 385f029..c354c96 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/locale/UserLocale.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/locale/UserLocale.java
@@ -31,7 +31,7 @@ import lombok.Value;
* @apiNote thread-safe and serializable
* @since 2.0 {@index}
*/
-@org.apache.isis.applib.annotations.Value
+@org.apache.isis.applib.annotation.Value
@Value
@Builder
public class UserLocale
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
index 7288f38..740f62f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
@@ -20,12 +20,12 @@ package org.apache.isis.applib.mixins.dto;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.NamedWithMimeType.CommonMimeType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
index 8d03eb7..df7a771 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
@@ -22,12 +22,12 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.IsisSchemas;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
index 7225bb1..27d5e7f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
@@ -20,13 +20,13 @@ package org.apache.isis.applib.mixins.layout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
import org.apache.isis.applib.services.layout.LayoutService;
import org.apache.isis.applib.services.layout.Style;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
index 62af9b4..c369e9b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
@@ -23,13 +23,13 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
index c59dcfc..432c178 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
@@ -20,12 +20,12 @@ package org.apache.isis.applib.mixins.metamodel;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
index e6cbb67..26a5abd 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
@@ -20,12 +20,12 @@ package org.apache.isis.applib.mixins.metamodel;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
index e4443f4..78f47c0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
@@ -20,12 +20,12 @@ package org.apache.isis.applib.mixins.metamodel;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.services.metamodel.MetaModelService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
index e816b6b..4bb30df 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
@@ -22,12 +22,12 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.LocalResourcePath;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
index 4ec26cb..944b004 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
@@ -21,10 +21,10 @@ package org.apache.isis.applib.mixins.system;
import java.sql.Timestamp;
import java.util.UUID;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.applib.services.bookmark.Bookmark;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord_openTargetObject.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord_openTargetObject.java
index b329248..1562f0e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord_openTargetObject.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord_openTargetObject.java
@@ -20,10 +20,10 @@ package org.apache.isis.applib.mixins.system;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.metamodel.BeanSort;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeature.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeature.java
index d33a9ea..aac2166 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeature.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeature.java
@@ -19,8 +19,8 @@
package org.apache.isis.applib.services.appfeat;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.SemanticsOf;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Value;
import java.util.Collections;
import java.util.Optional;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
index 2515e822..cc3eee3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
@@ -29,8 +29,8 @@ import static java.util.Comparator.nullsFirst;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Programmatic;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.util.Equality;
import org.apache.isis.applib.util.Hashing;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureSort.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureSort.java
index 7b320ef..bc6bea0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureSort.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureSort.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.appfeat;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
/**
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java
index e6c74f2..754b969 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java
@@ -24,15 +24,15 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.ObjectSupport;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.isis.applib.services.factory.FactoryService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
index efa2374..40aeac2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
@@ -30,16 +30,16 @@ import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.ViewModel;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Navigable;
-import org.apache.isis.applib.annotations.ObjectSupport;
-import org.apache.isis.applib.annotations.Parameter;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.Programmatic;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Navigable;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationNamespace.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationNamespace.java
index 1bafce2..c3a5854 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationNamespace.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationNamespace.java
@@ -26,11 +26,11 @@ import java.util.List;
import java.util.SortedSet;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationType.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationType.java
index 56554e8..df81637 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationType.java
@@ -26,11 +26,11 @@ import java.util.List;
import java.util.SortedSet;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeAction.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeAction.java
index a7a3eaf..bfce1ba 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeAction.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeAction.java
@@ -24,11 +24,11 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeCollection.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeCollection.java
index c5d75ad..ce8e247 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeCollection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeCollection.java
@@ -23,10 +23,10 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeMember.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeMember.java
index 6afd43d..94e570f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeMember.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeMember.java
@@ -24,11 +24,11 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import lombok.NoArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeProperty.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeProperty.java
index fa32c10..85ae20e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeProperty.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationTypeProperty.java
@@ -24,12 +24,12 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
index 85de74c..dc4347d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
@@ -42,7 +42,7 @@ import lombok.val;
*
* @since 1.x revised for 2.0 {@index}
*/
-@org.apache.isis.applib.annotations.Value(
+@org.apache.isis.applib.annotation.Value(
logicalTypeName = IsisModuleApplib.NAMESPACE + ".Bookmark")
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public final class Bookmark implements Oid {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
index 1652969..be454b4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
@@ -21,9 +21,9 @@ package org.apache.isis.applib.services.bookmark;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
index 5fa03fa..901ee3f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.services.bookmark;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Property;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
index d408c50..c1aab84 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
@@ -26,7 +26,7 @@ import javax.inject.Provider;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactnlayer.InteractionLayerTracker;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
index 79cd62d..b696bfd 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.services.commanddto.conmap;
import lombok.val;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.commanddto.HasCommandDto;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.commanddto.processor.spi.CommandDtoProcessorService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
index 6d6801f..e6c2b07 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.conmap.ContentMappingService;
import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.cmd.v2.CommandsDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
index e1a3f50..5ed5152 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
@@ -20,8 +20,8 @@ package org.apache.isis.applib.services.commanddto.processor.spi;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.schema.cmd.v2.CommandDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
index 6444e7a..2654183 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
@@ -22,7 +22,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.schema.cmd.v2.CommandDto;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
index e8fdd79..3e3a830 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
@@ -22,14 +22,14 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
index 9286a6a..514877a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
@@ -25,10 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Editing;
-import org.apache.isis.applib.annotations.Title;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.internal.base._Objects;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
index 64f4608..06a39b0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
@@ -24,10 +24,10 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.ObjectSupport;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
@DomainObject(
nature = Nature.VIEW_MODEL,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
index d293b17..8c9d653 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.applib.services.grid;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.layout.grid.Grid;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
index 69fd9f5..b431fe8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
@@ -87,9 +87,9 @@ public interface GridSystemService<G extends Grid> {
*
* <p>
* This is done using existing metadata, most notably that of the
- * {@link org.apache.isis.applib.annotations.MemberOrder} annotation.
+ * {@link org.apache.isis.applib.annotation.MemberOrder} annotation.
* Such a grid, if persisted as the layout XML file for the domain class,
- * allows the {@link org.apache.isis.applib.annotations.MemberOrder}
+ * allows the {@link org.apache.isis.applib.annotation.MemberOrder}
* annotation to be removed from the source code of the domain class
* (but other annotations must be retained).
* </p>
@@ -104,9 +104,9 @@ public interface GridSystemService<G extends Grid> {
* <p>
* Such a grid, if persisted as the layout XML file for the domain class,
* allows all layout annotations
- * ({@link org.apache.isis.applib.annotations.ActionLayout},
- * {@link org.apache.isis.applib.annotations.PropertyLayout},
- * {@link org.apache.isis.applib.annotations.CollectionLayout}) to be
+ * ({@link org.apache.isis.applib.annotation.ActionLayout},
+ * {@link org.apache.isis.applib.annotation.PropertyLayout},
+ * {@link org.apache.isis.applib.annotation.CollectionLayout}) to be
* removed from the source code of the domain class.
*
* </p>
@@ -122,7 +122,7 @@ public interface GridSystemService<G extends Grid> {
* <p>
* Such a grid, if persisted as the layout XML file for the domain
* class, requires that the
- * {@link org.apache.isis.applib.annotations.MemberOrder} annotation
+ * {@link org.apache.isis.applib.annotation.MemberOrder} annotation
* is retained in the source code of said class in order to bind
* members to the regions of the grid.
* </p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/homepage/HomePageResolverService.java b/api/applib/src/main/java/org/apache/isis/applib/services/homepage/HomePageResolverService.java
index fbe6bc4..9c982fa 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/homepage/HomePageResolverService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/homepage/HomePageResolverService.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.homepage;
-import org.apache.isis.applib.annotations.HomePage;
+import org.apache.isis.applib.annotation.HomePage;
/**
* This service simply provides access to the home page object (if any)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/homepage/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/homepage/package-info.java
index 5f7f1ca..2bb38af 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/homepage/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/homepage/package-info.java
@@ -19,6 +19,6 @@
/**
* The {@link org.apache.isis.applib.services.homepage.HomePageResolverService} returns the view model, if any
- * annotated with {@link org.apache.isis.applib.annotations.HomePage}.
+ * annotated with {@link org.apache.isis.applib.annotation.HomePage}.
*/
package org.apache.isis.applib.services.homepage;
\ No newline at end of file
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index affedc3..dc87018 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.commons.internal.collections._Lists;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/IsisSchemas.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/IsisSchemas.java
index 59e49d7..38df18d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/IsisSchemas.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/IsisSchemas.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.jaxb;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index 25a0384..078067e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -23,15 +23,15 @@ import javax.activation.MimeTypeParseException;
import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/layout/Style.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/Style.java
index f8e6a28..d76f463 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/layout/Style.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/layout/Style.java
@@ -19,8 +19,8 @@
package org.apache.isis.applib.services.layout;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.layout.grid.Grid;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
index bbd3faf..8a2c3e3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.menu;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
index c4ad5ff..46a98be 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
@@ -22,7 +22,7 @@ import javax.enterprise.inject.Vetoed;
import org.springframework.context.annotation.Profile;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Top level object classification.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index f2eb084..ed0bf95 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -22,9 +22,9 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
index cb6d86b..46fd55d3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
@@ -29,18 +29,18 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Parameter;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
index d67c17c..d20d877 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.metrics;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.schema.ixn.v2.MemberExecutionDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
index a8fb229..ca78e9e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
@@ -24,7 +24,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.publishing.spi.CommandSubscriber;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
index 80d5e28..0c45ec9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
@@ -24,7 +24,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.publishing.spi.EntityChanges;
import org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
index d7c9682..6526611 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
@@ -24,7 +24,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
index 174782c..56cd391 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
@@ -24,7 +24,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChangesSubscriber.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChangesSubscriber.java
index 72abd51..77c91f4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChangesSubscriber.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChangesSubscriber.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.publishing.spi;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.having.HasEnabling;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
index 4271cc7..732d420 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.publishing.spi;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.having.HasEnabling;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/ExecutionSubscriber.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/ExecutionSubscriber.java
index 28ba945..908951c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/ExecutionSubscriber.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/ExecutionSubscriber.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.applib.services.publishing.spi;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.apache.isis.commons.having.HasEnabling;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index 0c2cca0..5994bae 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -31,8 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.InteractionScope;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.InteractionScope;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/registry/InstanceByPriorityComparator.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/InstanceByPriorityComparator.java
index f836203..bf83f43 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/registry/InstanceByPriorityComparator.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/registry/InstanceByPriorityComparator.java
@@ -24,7 +24,7 @@ import javax.annotation.Priority;
import org.springframework.context.annotation.Primary;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.reflection._Reflect;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
index eb67ab6..e2a8dc3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
@@ -47,7 +47,7 @@ package org.apache.isis.applib.services.routing;
* </p>
* <p>
* For example, return the home page (eg as defined by the
- * {@link org.apache.isis.applib.annotations.HomePage} annotation).
+ * {@link org.apache.isis.applib.annotation.HomePage} annotation).
* </p>
* </li>
* </ul>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingServiceLogging.java b/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingServiceLogging.java
index 51ac043..eef5a1a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingServiceLogging.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingServiceLogging.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sitemap/SitemapServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/sitemap/SitemapServiceMenu.java
index 012d304..a7ddc92 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sitemap/SitemapServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sitemap/SitemapServiceMenu.java
@@ -21,16 +21,16 @@ package org.apache.isis.applib.services.sitemap;
import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Parameter;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.internal.base._Strings;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
index e188f5e..284ea42 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
@@ -29,7 +29,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Format.java b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Format.java
index bd16ed0..19c90b0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Format.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Format.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.swagger;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
/**
* The format to generate the representation of the swagger spec.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Visibility.java b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Visibility.java
index 0df81fa..6b2b756 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Visibility.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/Visibility.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.swagger;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.*;
+import org.apache.isis.applib.annotation.*;
/**
* Specifies which elements of the metamodel are included within the generated
@@ -37,7 +37,7 @@ public enum Visibility {
* <p>
* The generated swagger spec is therefore restricted only to include only
* view models ({@link DomainObject#nature()} of
- * {@link org.apache.isis.applib.annotations.Nature#VIEW_MODEL})
+ * {@link org.apache.isis.applib.annotation.Nature#VIEW_MODEL})
* and to REST domain services ({@link DomainService#nature()} of
* {@link NatureOfService#REST}). Exposing entities also would couple the
* REST client too deeply to the backend implementation.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
index f6b312b..8bb1f46 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
@@ -25,16 +25,16 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.message.MessageService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateStopMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateStopMenu.java
index 7603ee8..6233f14 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateStopMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateStopMenu.java
@@ -21,17 +21,17 @@ package org.apache.isis.applib.services.user;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.Redirect;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.Redirect;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
index 035db03..dc8ab32 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
@@ -24,11 +24,11 @@ import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PropertyLayout;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
index bd8121f..5b43149 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
@@ -31,17 +31,17 @@ import org.springframework.core.annotation.Order;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.Programmatic;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.locale.UserLocale;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.commons.collections.Can;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
index 264d8bd..831b179 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
@@ -30,7 +30,7 @@ import javax.inject.Provider;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.isis.applib.services.sudo.SudoService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/userui/UserMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/userui/UserMenu.java
index 475db4a..3c3ae10 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/userui/UserMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/userui/UserMenu.java
@@ -21,14 +21,14 @@ package org.apache.isis.applib.services.userui;
import javax.inject.Inject;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.services.user.UserService;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
index 094f00a..0a6ea43 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.reflection._ClassCache;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index 140cd05..607e690 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.reflection._ClassCache;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
index 3339d42..3fe1b93 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.spec;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* An implementation of the <i>Specification</i> pattern, as described in Eric
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
index d95cf3f..febfeae 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.spec;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
index 18c0302..ecc0bfe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.spec;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.ReasonBuffer;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
index 39e30f2..ee3d6ea 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.spec;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
/**
* Adapter to make it easy to perform boolean algebra on {@link Specification}s.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
index a7b055b..fb5f68d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.spec;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.ReasonBuffer;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
index 64be19e..8f35ec0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/package-info.java
@@ -20,7 +20,7 @@
/**
* This package defines a {@link org.apache.isis.applib.spec.Specification}
* interface (and various implementations), used by the
- * {@link org.apache.isis.applib.annotations.MustSatisfy} annotation to
+ * {@link org.apache.isis.applib.annotation.MustSatisfy} annotation to
* declare valid values for properties or parameters.
*
* <p>
@@ -29,10 +29,10 @@
* parameters (in the <tt>validateXxx()</tt> methods to be factored out.
*
* <p>
- * That said, there is still some repetition in that the {@link org.apache.isis.applib.annotations.MustSatisfy}
+ * That said, there is still some repetition in that the {@link org.apache.isis.applib.annotation.MustSatisfy}
* annotation must be applied in all appropriate cases. If it is the case that
* the validation rules would apply <i>every</i> case, then it is generally
- * preferable to implement a {@link org.apache.isis.applib.annotations.Value} type
+ * preferable to implement a {@link org.apache.isis.applib.annotation.Value} type
* through the {@link org.apache.isis.applib.value.semantics.ValueSemanticsProvider}
* interface.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
index de017c1..7443950 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
@@ -51,7 +51,7 @@ public class TitleBuffer {
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>;
* it doesn't honour other mechanisms for specifying the title, such as
- * {@link org.apache.isis.applib.annotations.Title}
+ * {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -106,7 +106,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -122,7 +122,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -159,7 +159,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -180,7 +180,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -222,7 +222,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -249,7 +249,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -334,7 +334,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -393,7 +393,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
@@ -417,7 +417,7 @@ public class TitleBuffer {
*
* <p>
* Note: this method only obtains the title using either <tt>title()</tt> or <tt>toString()</tt>; it doesn't
- * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotations.Title}
+ * honour other mechanisms for specifying the title, such as {@link org.apache.isis.applib.annotation.Title}
* annotation. If that functionality is required, first call
* {@link TitleService#titleOf(Object)} on the object and pass in the resultant
* string.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/util/package-info.java
index e19dec0..2018cd7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/package-info.java
@@ -30,10 +30,10 @@
* parameters (in the <tt>validateXxx()</tt> methods to be factored out.
*
* <p>
- * That said, there is still some repetition in that the {@link org.apache.isis.applib.annotations.MustSatisfy}
+ * That said, there is still some repetition in that the {@link org.apache.isis.applib.annotation.MustSatisfy}
* annotation must be applied in all appropriate cases. If it is the case that
* the validation rules would apply <i>every</i> case, then it is generally
- * preferable to implement a {@link org.apache.isis.applib.annotations.Value} type
+ * preferable to implement a {@link org.apache.isis.applib.annotation.Value} type
* through the {@link org.apache.isis.applib.value.semantics.ValueSemanticsProvider}
* interface.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Blob.java b/api/applib/src/main/java/org/apache/isis/applib/value/Blob.java
index 03761d6..f7610bf 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Blob.java
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.jaxb.PrimitiveJaxbAdapters;
import org.apache.isis.applib.util.ZipReader;
import org.apache.isis.applib.util.ZipWriter;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/api/applib/src/main/java/org/apache/isis/applib/value/Clob.java
index d80999e..e8f40ab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Clob.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Clob.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.jaxb.PrimitiveJaxbAdapters;
import org.apache.isis.commons.internal.base._Strings;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
index b6dca4c..6aed14b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
index 6f117e9..40e2aef 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.commons.internal.base._Strings;
import lombok.EqualsAndHashCode;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
index 378b0b1..f9f2fd7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
/**
* Represents a password that will not displayed to the UI but can be persisted.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/value/package-info.java
index dd4820e..bc71541 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/package-info.java
@@ -19,7 +19,7 @@
/**
* This package defines an additional set of
- * {@link org.apache.isis.applib.annotations.Value} types, supported in addition
+ * {@link org.apache.isis.applib.annotation.Value} types, supported in addition
* to the usual JDK ones (of {@link java.lang.String}, {@link java.lang.Integer}, {@link java.math.BigDecimal}, {@link java.util.Date}
* etc and the primitives).
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/TemporalValueSemantics.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/TemporalValueSemantics.java
index bf67487..010cdf3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/TemporalValueSemantics.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/TemporalValueSemantics.java
@@ -24,7 +24,7 @@ import java.time.temporal.Temporal;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-import org.apache.isis.applib.annotations.TimePrecision;
+import org.apache.isis.applib.annotation.TimePrecision;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import lombok.Data;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
index b9d0f19..7942be2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
@@ -33,7 +33,7 @@ import java.util.function.Function;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.TimePrecision;
+import org.apache.isis.applib.annotation.TimePrecision;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.applib.locale.UserLocale;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
index 3b0fa31..2c9216d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.value.semantics;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.schema.chg.v2.ChangesDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/package-info.java
index 6f52d12..3fb1363 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/package-info.java
@@ -36,7 +36,7 @@
* <p>
* The association between {@link org.apache.isis.applib.value.semantics.ValueSemanticsProvider}
* and its corresponding type can be done in several ways. Most straightforward
- * is to annotate the class with the {@link org.apache.isis.applib.annotations.Value}
+ * is to annotate the class with the {@link org.apache.isis.applib.annotation.Value}
* annotation. However, if the value type source code cannot be modified (for
* example, if it is a third-party type such as joda-time), then the association
* can be made using configuration properties.
diff --git a/api/applib/src/test/java/org/apache/isis/applib/commons/internal/reflection/ReflectTest.java b/api/applib/src/test/java/org/apache/isis/applib/commons/internal/reflection/ReflectTest.java
index 103ed02..544b463 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/commons/internal/reflection/ReflectTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/commons/internal/reflection/ReflectTest.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java b/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
index 1efbd72..f3cb74c 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
@@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Repainting;
+import org.apache.isis.applib.annotation.Repainting;
public class PropertyLayoutData_repaint_Test {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java b/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
index 70d39ea..50c4c20 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
public class EnumsTest {
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index d82b0a0..0ba5929 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -53,12 +53,12 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.validation.annotation.Validated;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
-import org.apache.isis.applib.annotations.LabelPosition;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.services.i18n.Mode;
import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
@@ -210,7 +210,7 @@ public class IsisConfiguration {
* sent through to {@link EntityPropertyChangeSubscriber}.
*
* <p>
- * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotations.DomainObject#entityChangePublishing()}
+ * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotation.DomainObject#entityChangePublishing()}
* </p>
*
* <p>
@@ -239,7 +239,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#createdLifecycleEvent() @DomainObject(createdLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#createdLifecycleEvent() @DomainObject(createdLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -272,7 +272,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#loadedLifecycleEvent() @DomainObject(loadedLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#loadedLifecycleEvent() @DomainObject(loadedLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -309,7 +309,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#persistingLifecycleEvent() @DomainObject(persistingLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#persistingLifecycleEvent() @DomainObject(persistingLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -346,7 +346,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#persistedLifecycleEvent() @DomainObject(persistedLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#persistedLifecycleEvent() @DomainObject(persistedLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -384,7 +384,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#removingLifecycleEvent() @DomainObject(removingLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#removingLifecycleEvent() @DomainObject(removingLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -426,7 +426,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#updatedLifecycleEvent() @DomainObject(updatedLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#updatedLifecycleEvent() @DomainObject(updatedLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -463,7 +463,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObject#updatingLifecycleEvent() @DomainObject(updatingLifecycleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObject#updatingLifecycleEvent() @DomainObject(updatingLifecycleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -501,7 +501,7 @@ public class IsisConfiguration {
* result of invoking an action.
*
* <p>
- * This can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotations.DomainObjectLayout#paged()}.
+ * This can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotation.DomainObjectLayout#paged()}.
* </p>
*/
private int paged = 25;
@@ -518,7 +518,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#cssClassUiEvent()} @DomainObjectLayout(cssClassEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#cssClassUiEvent()} @DomainObjectLayout(cssClassEvent=...)} for the
* domain object in question.
* </p>
*
@@ -559,7 +559,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#iconUiEvent()} @DomainObjectLayout(iconEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#iconUiEvent()} @DomainObjectLayout(iconEvent=...)} for the
* domain object in question.
* </p>
*
@@ -605,7 +605,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#layoutUiEvent()} @DomainObjectLayout(layoutEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#layoutUiEvent()} @DomainObjectLayout(layoutEvent=...)} for the
* domain object in question.
* </p>
*
@@ -646,7 +646,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout#titleUiEvent()} @DomainObjectLayout(titleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout#titleUiEvent()} @DomainObjectLayout(titleEvent=...)} for the
* domain object in question.
* </p>
*
@@ -691,7 +691,7 @@ public class IsisConfiguration {
*
* <p>
* This setting can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.Action#commandPublishing()}.
+ * {@link org.apache.isis.applib.annotation.Action#commandPublishing()}.
* </p>
*/
private ActionPublishingPolicy commandPublishing = ActionPublishingPolicy.NONE;
@@ -710,7 +710,7 @@ public class IsisConfiguration {
* </p>
*
* <p>
- * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotations.Action#executionDispatch()}.
+ * This setting can be overridden on a case-by-case basis using {@link org.apache.isis.applib.annotation.Action#executionDispatch()}.
* </p>
*/
private ActionPublishingPolicy executionPublishing = ActionPublishingPolicy.NONE;
@@ -732,7 +732,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is actually sent depends
- * on the value of the {@link org.apache.isis.applib.annotations.Action#domainEvent()} for the
+ * on the value of the {@link org.apache.isis.applib.annotation.Action#domainEvent()} for the
* action in question:
* </p>
*
@@ -778,7 +778,7 @@ public class IsisConfiguration {
*
* <p>
* The CSS class for individual actions can be overridden using
- * {@link org.apache.isis.applib.annotations.ActionLayout#cssClass()}.
+ * {@link org.apache.isis.applib.annotation.ActionLayout#cssClass()}.
* </p>
*/
private String[] patterns = {
@@ -805,7 +805,7 @@ public class IsisConfiguration {
*
* <p>
* The font awesome class for individual actions can be overridden using
- * {@link org.apache.isis.applib.annotations.ActionLayout#cssClassFa()}.
+ * {@link org.apache.isis.applib.annotation.ActionLayout#cssClassFa()}.
* </p>
*/
private String[] patterns = {
@@ -877,7 +877,7 @@ public class IsisConfiguration {
*
* <p>
* This setting can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.Property#commandDispatch()}.
+ * {@link org.apache.isis.applib.annotation.Property#commandDispatch()}.
* </p>
*/
private PropertyPublishingPolicy commandPublishing = PropertyPublishingPolicy.NONE;
@@ -896,7 +896,7 @@ public class IsisConfiguration {
*
* <p>
* This setting can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.Property#publishing()}.
+ * {@link org.apache.isis.applib.annotation.Property#publishing()}.
* </p>
*/
private PropertyPublishingPolicy executionPublishing = PropertyPublishingPolicy.NONE;
@@ -918,7 +918,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is actually sent depends
- * on the value of the {@link org.apache.isis.applib.annotations.Property#domainEvent()} for the
+ * on the value of the {@link org.apache.isis.applib.annotation.Property#domainEvent()} for the
* property in question:
* </p>
*
@@ -951,7 +951,7 @@ public class IsisConfiguration {
*
* <p>
* Can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.ParameterLayout#labelPosition()}.
+ * {@link org.apache.isis.applib.annotation.ParameterLayout#labelPosition()}.
* </p>
*
* <p>
@@ -983,7 +983,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is actually sent depends
- * on the value of the {@link org.apache.isis.applib.annotations.Collection#domainEvent()} for the
+ * on the value of the {@link org.apache.isis.applib.annotation.Collection#domainEvent()} for the
* collection action in question:
* </p>
*
@@ -1016,7 +1016,7 @@ public class IsisConfiguration {
*
* <p>
* The value of this can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.CollectionLayout#defaultView()}.
+ * {@link org.apache.isis.applib.annotation.CollectionLayout#defaultView()}.
* Note that this default configuration property is an enum and so defines only a fixed number of
* values, whereas the annotation returns a string; this is to allow for flexibility that
* individual viewers might support their own additional types. For example, the Wicket viewer
@@ -1033,7 +1033,7 @@ public class IsisConfiguration {
*
* <p>
* This can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.CollectionLayout#paged()}.
+ * {@link org.apache.isis.applib.annotation.CollectionLayout#paged()}.
* </p>
*/
private int paged = 12;
@@ -1050,10 +1050,10 @@ public class IsisConfiguration {
public static class SemanticChecking {
/**
* Whether to check for inconsistencies between the usage of
- * {@link org.apache.isis.applib.annotations.DomainObject},
- * {@link org.apache.isis.applib.annotations.ViewModel},
- * {@link org.apache.isis.applib.annotations.DomainObjectLayout} and
- * {@link org.apache.isis.applib.annotations.ViewModelLayout}.
+ * {@link org.apache.isis.applib.annotation.DomainObject},
+ * {@link org.apache.isis.applib.annotation.ViewModel},
+ * {@link org.apache.isis.applib.annotation.DomainObjectLayout} and
+ * {@link org.apache.isis.applib.annotation.ViewModelLayout}.
*/
private boolean enable = false;
}
@@ -1071,14 +1071,14 @@ public class IsisConfiguration {
* Influences whether an {@link org.apache.isis.applib.events.ui.CssClassUiEvent} should
* be published (on the internal {@link org.apache.isis.applib.services.eventbus.EventBusService})
* whenever a view model (annotated with
- * {@link org.apache.isis.applib.annotations.ViewModel @ViewModel}) is about to be rendered in the
+ * {@link org.apache.isis.applib.annotation.ViewModel @ViewModel}) is about to be rendered in the
* UI - thereby allowing subscribers to optionally
* {@link org.apache.isis.applib.events.ui.CssClassUiEvent#setCssClass(String)} change) the CSS
* classes that are used.
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.ViewModelLayout#cssClassUiEvent()} @ViewModelLayout(cssClassEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.ViewModelLayout#cssClassUiEvent()} @ViewModelLayout(cssClassEvent=...)} for the
* domain object in question:
* </p>
*
@@ -1108,14 +1108,14 @@ public class IsisConfiguration {
* Influences whether an {@link org.apache.isis.applib.events.ui.IconUiEvent} should
* be published (on the internal {@link org.apache.isis.applib.services.eventbus.EventBusService})
* whenever a view model (annotated with
- * {@link org.apache.isis.applib.annotations.ViewModel @ViewModel}) is about to be rendered in the
+ * {@link org.apache.isis.applib.annotation.ViewModel @ViewModel}) is about to be rendered in the
* UI - thereby allowing subscribers to optionally
* {@link org.apache.isis.applib.events.ui.IconUiEvent#setIconName(String)} change) the icon that
* is used.
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.ViewModelLayout#iconUiEvent()} @ViewModelLayout(iconEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.ViewModelLayout#iconUiEvent()} @ViewModelLayout(iconEvent=...)} for the
* domain object in question:
* </p>
*
@@ -1145,7 +1145,7 @@ public class IsisConfiguration {
* Influences whether an {@link org.apache.isis.applib.events.ui.LayoutUiEvent} should
* be published (on the internal {@link org.apache.isis.applib.services.eventbus.EventBusService})
* whenever a view model (annotated with
- * {@link org.apache.isis.applib.annotations.ViewModel @ViewModel}) is about to be rendered in the
+ * {@link org.apache.isis.applib.annotation.ViewModel @ViewModel}) is about to be rendered in the
* UI - thereby allowing subscribers to optionally
* {@link org.apache.isis.applib.events.ui.LayoutUiEvent#setLayout(String)} change) the layout that is used.
*
@@ -1156,7 +1156,7 @@ public class IsisConfiguration {
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.ViewModelLayout#layoutUiEvent()} @ViewModelLayout(layoutEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.ViewModelLayout#layoutUiEvent()} @ViewModelLayout(layoutEvent=...)} for the
* domain object in question:
* </p>
*
@@ -1186,14 +1186,14 @@ public class IsisConfiguration {
* Influences whether an {@link org.apache.isis.applib.events.ui.TitleUiEvent} should
* be published (on the internal {@link org.apache.isis.applib.services.eventbus.EventBusService})
* whenever a view model (annotated with
- * {@link org.apache.isis.applib.annotations.ViewModel @ViewModel}) is about to be rendered in the
+ * {@link org.apache.isis.applib.annotation.ViewModel @ViewModel}) is about to be rendered in the
* UI - thereby allowing subscribers to
* optionally {@link org.apache.isis.applib.events.ui.TitleUiEvent#setTitle(String)} change)
* the title that is used.
*
* <p>
* The algorithm for determining whether (and what type of) an event is sent depends on the value of the
- * {@link org.apache.isis.applib.annotations.ViewModelLayout#titleUiEvent()} @ViewModelLayout(titleEvent=...)} for the
+ * {@link org.apache.isis.applib.annotation.ViewModelLayout#titleUiEvent()} @ViewModelLayout(titleEvent=...)} for the
* domain object in question:
* </p>
*
@@ -1225,7 +1225,7 @@ public class IsisConfiguration {
*
* <p>
* Can be overridden on a case-by-case basis using
- * {@link org.apache.isis.applib.annotations.ParameterLayout#labelPosition()}.
+ * {@link org.apache.isis.applib.annotation.ParameterLayout#labelPosition()}.
* </p>
*
* <p>
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index eca8cfa..340bfcb 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -32,8 +32,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainService;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.beans.aoppatch.AopPatch;
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierDefault.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierDefault.java
index 3f37398..867446a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierDefault.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierDefault.java
@@ -29,8 +29,8 @@ import javax.persistence.Table;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainService;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
@@ -98,7 +98,7 @@ implements IsisBeanTypeClassifier {
// handle value types ...
- val aValue = findNearestAnnotation(type, org.apache.isis.applib.annotations.Value.class)
+ val aValue = findNearestAnnotation(type, org.apache.isis.applib.annotation.Value.class)
.orElse(null);
if(aValue!=null) {
return BeanClassification.delegated(BeanSort.VALUE);
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
index 206b78c..9dfce0a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
@@ -32,7 +32,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
diff --git a/core/config/src/main/java/org/apache/isis/core/config/datasources/DataSourceIntrospectionService.java b/core/config/src/main/java/org/apache/isis/core/config/datasources/DataSourceIntrospectionService.java
index 4e1c1ff..3886388 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/datasources/DataSourceIntrospectionService.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/datasources/DataSourceIntrospectionService.java
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
diff --git a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
index b8ea4eb..e1e4502 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
@@ -36,10 +36,10 @@ import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Domain;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.ObjectLifecycle;
-import org.apache.isis.applib.annotations.ObjectSupport;
+import org.apache.isis.applib.annotation.Domain;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ObjectLifecycle;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Refs;
diff --git a/core/config/src/main/java/org/apache/isis/core/config/viewer/web/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/web/WebAppContextPath.java
index 9cd866d..54f3357 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/viewer/web/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/web/WebAppContextPath.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.resources._Resources;
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index 65cf54a..4a07b42 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@ -33,7 +33,7 @@ import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.functional.ThrowingRunnable;
import org.apache.isis.commons.internal.collections._Lists;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
index 0342dd1..6003141 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
@@ -115,7 +115,7 @@ public interface MetaModelContext {
* <p>
* If there is more than one implementation, then the one with the "highest"
* priority (either annotated with {@link org.springframework.context.annotation.Primary},
- * else with encountered with earliest {@link org.apache.isis.applib.annotations.PriorityPrecedence precedence})
+ * else with encountered with earliest {@link org.apache.isis.applib.annotation.PriorityPrecedence precedence})
* is used instead.
* </p>
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java
index 05fb0d9..cc3779c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.collections.ImmutableEnumSet;
import org.apache.isis.commons.internal.reflection._Annotations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
index 250b08d..47fc7a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
index 2fb53c4..7bee4c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacetAbstract.java
index 707ee64..02cb5dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
index a59bca7..74dd470 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Collection;
+import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.commons.internal.collections._Collections;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 6424a4f..74990ca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.commons.internal.base._Strings;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetForActionAnnotation.java
index c1bd6d8..e4dbaab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetForActionAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.action.explicit;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
index 20f52d1..75a4b96 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.action.hidden;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index e93d83a..871fc79 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.actions.action.prototype;
import java.util.Optional;
import java.util.function.Supplier;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.RestrictTo;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.core.config.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java
index 52ad384..e3dad8c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFallbackToNonIdempotent.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action.semantics;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java
index 4286e3e..3a68c39 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetForActionAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.action.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
index 86810bb..705b86a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.action.typeof;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
index 5434382..05e1089 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.contributing.derived;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
index 8bae861..ff70857 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.fileaccept;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index cb571cc..5c4bca5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.HomePage;
+import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index d79774e..cc33a71 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java
index 72fb050..271a8ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
index 551b334..15a8bc7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
@@ -33,13 +33,13 @@ public class ActionPositionFacetForActionXml extends ActionPositionFacetAbstract
if(actionLayout == null) {
return Optional.empty();
}
- final org.apache.isis.applib.annotations.ActionLayout.Position position = actionLayout.getPosition();
+ final org.apache.isis.applib.annotation.ActionLayout.Position position = actionLayout.getPosition();
return Optional.ofNullable(position)
.map(pos->new ActionPositionFacetForActionXml(pos, holder));
}
- private ActionPositionFacetForActionXml(final org.apache.isis.applib.annotations.ActionLayout.Position position, final FacetHolder holder) {
+ private ActionPositionFacetForActionXml(final org.apache.isis.applib.annotation.ActionLayout.Position position, final FacetHolder holder) {
super(position, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java
index ef0b0b8..3085ef2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
index 3c3b4b7..a13c3f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
index b6175f9..ad1b0b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
index 4bb8206..de73cbb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java
index d59960b..5840255 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionXml.java
index ac5d6af..daea65b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
index d50a84c..97f4542 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
index 78c112f..79f199d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index 12123a7..8ccc9eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.commons.internal.base._Optionals;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java
index f495588..9884106 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
index 30c2c19..d9a283c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.Redirect;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java
index 29a4feb..76e995c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Redirect;
+import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
index 48bfbc8..0870468 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.NatureOfService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
index c83302e..3392ca5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.NatureOfService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacet.java
index 365d9f1..b7f2627 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.position;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
index 7eb57fd..ff72f74 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.position;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
index 0ce0f79..219bea6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.position;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class ActionPositionFacetFallback extends ActionPositionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacet.java
index a99ad41..f687bf9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.redirect;
-import org.apache.isis.applib.annotations.Redirect;
+import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
index caabb74..6037863 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.redirect;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.Redirect;
+import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java
index 3c4ffc8..9da7f1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.redirect;
-import org.apache.isis.applib.annotations.Redirect;
+import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class RedirectFacetFallback extends RedirectFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacet.java
index a8fd1e0..39f2904 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.semantics;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java
index 21f6b82..ed63d85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/semantics/ActionSemanticsFacetAbstract.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.semantics;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index feceac4..5b7ea55 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -22,8 +22,8 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.commons.internal.collections._Collections;
import org.apache.isis.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
index c99089c..796ae20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.collections.collection.hidden;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
index 3922a56..1a8fe33 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.annotations.Collection;
+import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
index 7526788..393547e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.collection.typeof;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Collection;
+import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
index 109751a..f3150a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
index 9d04a35..1a900a6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetSimple;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index 78d5b88..158de60 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java
index 7cd89e8..a1e6765 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Objects;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
index 9ba2ee3..1ea8d01 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
index 3bf3f03..9089555 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
index e6a5417..4935612 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
index 4718775..a4a4e79 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 1596631..1c7d178 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Comparator;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
index ee59a51..655aa06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
index 3a7f343..4947a63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.fallback;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
index 0077492..a0e8fb4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating the
- * member with <tt>{@literal @}{@link org.apache.isis.applib.annotations.ActionLayout#cssClassFa() ActionLayout}</tt>#cssClassFa().
+ * member with <tt>{@literal @}{@link org.apache.isis.applib.annotation.ActionLayout#cssClassFa() ActionLayout}</tt>#cssClassFa().
*/
public interface CssClassFaFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
index ad5a847..50106eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
index 9fef0a2..2ea849f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
@@ -22,7 +22,7 @@ import java.util.function.BiConsumer;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetForContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetForContributee.java
index 9318bf8..57cbf0a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetForContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetForContributee.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.members.disabled;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class DisabledFacetForContributee
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 3c8b9fd..5816c5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.hidden;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.WhereValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java
index fc53dae..4b0a38e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractAlwaysEverywhere.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.members.hidden;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java
index 44d0002..fea9a3e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstractImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.members.hidden;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
index 02e4684..1f3842e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.hidden;
import java.util.Properties;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
index b236beb..122d115 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
@@ -23,9 +23,9 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
index 07c3123..224684e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.members.layout.group;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionAnnotation.java
index 1c7026a..1b57802 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.group;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutGroupFacetFromActionAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionLayoutAnnotation.java
index 1a3eff8..65ad2d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.group;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutGroupFacetFromActionLayoutAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
index c4973f6..92c2eb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.group;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutGroupFacetFromPropertyLayoutAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacet.java
index a75dc8f..98acfbf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacet.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.members.layout.order;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromActionLayoutAnnotation.java
index f058d6c..890e056 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromActionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.order;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ActionLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutOrderFacetFromActionLayoutAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromCollectionLayoutAnnotation.java
index 4621ebb..0dde065 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromCollectionLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.order;
import java.util.Optional;
-import org.apache.isis.applib.annotations.CollectionLayout;
+import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutOrderFacetFromCollectionLayoutAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromPropertyLayoutAnnotation.java
index 985b8c5..613482b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetFromPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.members.layout.order;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class LayoutOrderFacetFromPropertyLayoutAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
index 78bd5bc..5a05bf3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.members.publish.command;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.base._Optionals;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
index a881c50..2ffcf47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.members.publish.command;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.base._Optionals;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
index 75be0e6..fafcf7f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.base._Optionals;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
index bfc1128..a5aa850 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.base._Optionals;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
index 443e8ea..b5e4fb7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
@@ -22,9 +22,9 @@ import javax.inject.Inject;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.RecreatableDomainObject;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Nature;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
index 0e9d020..436a3e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.facets.object.bookmarkpolicy;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java
index 85bbb7a..13ed34c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.bookmarkpolicy;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java
index 5ade735..fed7199 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacetFallback.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.bookmarkpolicy;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
index cb37210..9784aa5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
@@ -22,7 +22,7 @@ import java.util.function.Predicate;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java
index 3eb85bd..4354b6b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java
index 766fe21..43e2248 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java
index 0c901ce..9af229d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java
index a29150b..23d925d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java
index c4a9792..ead7be0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java
index 3d64f14..c64be19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java
index 003e165..9bcd292 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
index 15f184a..e4cda80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
@@ -47,7 +47,7 @@ import lombok.val;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating the
- * member with {@link org.apache.isis.applib.annotations.Bounding Bounding} annotation.
+ * member with {@link org.apache.isis.applib.annotation.Bounding Bounding} annotation.
*/
public abstract class ChoicesFacetFromBoundedAbstract
extends FacetAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
index 1283cbc..d077e22 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
@@ -16,7 +16,7 @@
* under the License. */
package org.apache.isis.core.metamodel.facets.object.cssclassfa.annotation;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 9c5ba65..d3057db 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -27,12 +27,12 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
index 8e3bc2e..a804b22 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.choices;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Bounding;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.Bounding;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingEnabledFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingEnabledFacetForDomainObjectAnnotation.java
index 8b34b0a..36d90fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingEnabledFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingEnabledFacetForDomainObjectAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Editing;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.immutable.EditingEnabledFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 8cda9c7..439fe2f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
index d6876c8..47edfe1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepu
import java.util.Optional;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
index dad194c..34f5ed0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityC
/**
* If the domain object has not been annotated with
- * {@link org.apache.isis.applib.annotations.DomainObject} but entity-change-publishing
+ * {@link org.apache.isis.applib.annotation.DomainObject} but entity-change-publishing
* has been configured in <tt>application.properties</tt>.
*/
public class EntityChangePublishingFacetFromConfiguration
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
index 3a558c7..8ef21eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.introspection;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Introspection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.introspection.IntrospectionPolicyFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForDomainObjectAnnotation.java
index 3a68706..5a7994b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.logicaltype;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotation.java
index 7d3404d..b4f6714 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.logicaltype;
import java.util.Optional;
-import org.apache.isis.applib.annotations.LogicalTypeName;
+import org.apache.isis.applib.annotation.LogicalTypeName;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotationFacetFactory.java
index 565463d..598c4f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/logicaltype/LogicalTypeFacetForLogicalTypeNameAnnotationFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.logicaltype;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.LogicalTypeName;
+import org.apache.isis.applib.annotation.LogicalTypeName;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
index ef51e53..2f3ddb8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobject.recreatable;
import java.util.Objects;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.HasPostConstructMethodCache;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java
index 5afda5f..9583b48 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java
index c34dfd1..4af23d9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
index 8889fa9..04e066c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
@@ -18,7 +18,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
index c0425c3..f0ffbb9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
@@ -18,7 +18,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 0619186..6bf9fbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.exceptions.UnrecoverableException;
import org.apache.isis.commons.internal.base._Casts;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
index f63ec8b..268d444 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index b367d0c..33f231c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -18,7 +18,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 2d452a2..50d9ef3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.IconUiEvent;
import org.apache.isis.applib.exceptions.UnrecoverableException;
import org.apache.isis.commons.internal.base._Casts;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 3dbafb8..601f37c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.LayoutUiEvent;
import org.apache.isis.applib.exceptions.UnrecoverableException;
import org.apache.isis.commons.internal.base._Casts;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
index 0c13f01..4066caa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForms;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
index 4536e86..fa6f6ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index c0a56f2..978cf50 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.exceptions.UnrecoverableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
index 873ba92..f7fd95b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
@@ -22,18 +22,18 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.NatureOfService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
/**
- * Corresponds to annotating the class with the {@link org.apache.isis.applib.annotations.DomainService} annotation.
+ * Corresponds to annotating the class with the {@link org.apache.isis.applib.annotation.DomainService} annotation.
*/
public interface DomainServiceFacet extends Facet {
/**
- * Corresponds to {@link org.apache.isis.applib.annotations.DomainService#nature()}.
+ * Corresponds to {@link org.apache.isis.applib.annotation.DomainService#nature()}.
*
*/
public NatureOfService getNatureOfService();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
index c114954..a517310 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainservice;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.NatureOfService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
index 40d0a0d..4637048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.domainservice.annotation;
-import org.apache.isis.applib.annotations.NatureOfService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index a082357..2043d12 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.DomainService;
+import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java
index 33f3dd3..58339c7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacet.java
@@ -19,17 +19,17 @@
package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
- * Corresponds to annotating the class with the {@link org.apache.isis.applib.annotations.DomainServiceLayout} annotation.
+ * Corresponds to annotating the class with the {@link org.apache.isis.applib.annotation.DomainServiceLayout} annotation.
*/
public interface DomainServiceLayoutFacet extends Facet {
/**
- * Corresponds to {@link org.apache.isis.applib.annotations.DomainServiceLayout#menuBar()}.
+ * Corresponds to {@link org.apache.isis.applib.annotation.DomainServiceLayout#menuBar()}.
*/
public DomainServiceLayout.MenuBar getMenuBar();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java
index c40de65..da6bc6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index 2908a16..2996b58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
index a913206..a3b279c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForms;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java
index 6291131..1308560 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.domainservicelayout.annotation;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 628ce3a..da9c81a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -27,7 +27,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.reflection._Reflect;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index 46e6de7..13df587 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.reflection._Annotations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
index 816eeb4..7535987 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
@@ -19,10 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.introspection;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Introspection;
-import org.apache.isis.applib.annotations.Introspection.EncapsulationPolicy;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
+import org.apache.isis.applib.annotation.Introspection.EncapsulationPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
index 035809b..c8bd352 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.introspection;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.Introspection;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacet.java
index 846674b..d8094b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.logicaltype;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacet.java
index 023490f..58b58ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacet.java
@@ -20,11 +20,11 @@ package org.apache.isis.core.metamodel.facets.object.mixin;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
index b924f67..4462c9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.object.mixin;
import java.lang.reflect.Constructor;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index 5d19336..14a7733 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
index 0a094e4..68cc769 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
index 77a0b56..8e061c1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.projection;
-import org.apache.isis.applib.annotations.Projecting;
+import org.apache.isis.applib.annotation.Projecting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.properties.projection.ProjectingFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacet.java
index 25d616f..2afd706 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.promptStyle;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java
index e308cc1..ebc2ce0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.promptStyle;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class PromptStyleFacetAsConfigured
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
index 30ff9a7..afa41cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.title.annotation;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Title;
+import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 4b5fcc8..64330ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -26,7 +26,7 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
-import org.apache.isis.applib.annotations.Title;
+import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
index 30224c6..21e0d2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.value.annotcfg;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.value.semantics.EncoderDecoder;
import org.apache.isis.applib.value.semantics.ValueSemanticsProvider;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
index 1a9671c..dd65afc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.viewmodel;
import java.util.function.Function;
-import org.apache.isis.applib.annotations.Nature;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to
- * applying either {@link org.apache.isis.applib.annotations.DomainObject} annotation with
+ * applying either {@link org.apache.isis.applib.annotation.DomainObject} annotation with
* {@link Nature} = {@link Nature#VIEW_MODEL} or
* {@link org.apache.isis.applib.ViewModel} interface (for a view model), or by annotating
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacet.java
index 59f3073..f63eced 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
index b6c0a8e..3135e30 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.digits;
import javax.validation.constraints.Digits;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
index c70c136..3c7edde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.digits;
import javax.validation.constraints.Digits;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
index 13603ff..afa174e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.digits;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
index bd227e9..ac78607 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.digits;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacet.java
index 39ba01f..a37f549 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacet.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.labelat;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
- * Corresponds to either {@literal @}{@link org.apache.isis.applib.annotations.PropertyLayout#labelPosition()} (for a property) or
- *{@literal @}{@link org.apache.isis.applib.annotations.ParameterLayout#labelPosition()} (for an action parameter).
+ * Corresponds to either {@literal @}{@link org.apache.isis.applib.annotation.PropertyLayout#labelPosition()} (for a property) or
+ *{@literal @}{@link org.apache.isis.applib.annotation.ParameterLayout#labelPosition()} (for an action parameter).
*/
public interface LabelAtFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
index 77f4749..43e95c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.labelat;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
index b3cbf0a..fce87ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.labelat;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
/**
* If multi-line then position the label at the top.
*
* <p>
- * This can still be overridden using the {@link org.apache.isis.applib.annotations.PropertyLayout} annotation / layout.json.
+ * This can still be overridden using the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation / layout.json.
* </p>
*/
public class LabelAtFacetFromMultiLineFacet
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/DateFormatStyleFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/DateFormatStyleFacet.java
index 40599f5..7b8573d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/DateFormatStyleFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/DateFormatStyleFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.temporalformat;
import java.time.format.FormatStyle;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacet.java
index 5e4b72e..733920a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacet.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.temporalformat;
-import org.apache.isis.applib.annotations.TimePrecision;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.TimePrecision;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacetAbstract.java
index 6a587cb..119f39b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatPrecisionFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.temporalformat;
import java.util.Objects;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.TimePrecision;
+import org.apache.isis.applib.annotation.TimePrecision;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatStyleFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatStyleFacet.java
index 936c26c..c385a46 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatStyleFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/temporalformat/TimeFormatStyleFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.temporalformat;
import java.time.format.FormatStyle;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
index 0933aa3..a0e8bc1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.core.metamodel.facets.objectvalue.valuesemantics;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.Parameter;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/MinLengthUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/MinLengthUtil.java
index a0b9550..ba7e658 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/MinLengthUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/MinLengthUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.param.autocomplete;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.MinLength;
+import org.apache.isis.applib.annotation.MinLength;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
index 3e4c7cf..6eb64b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
index 8dabb71..bcdbd63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/LabelAtFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/LabelAtFacetForParameterLayoutAnnotation.java
index cc2e9ce..382fa15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/LabelAtFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/LabelAtFacetForParameterLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.LabelPosition;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/MultiLineFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/MultiLineFacetForParameterLayoutAnnotation.java
index 92a1ffb..269f877 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/MultiLineFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/MultiLineFacetForParameterLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
index ea0e041..42767e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.ParamNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
index 00f2134..291694b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/RenderedAdjustedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/RenderedAdjustedFacetForParameterLayoutAnnotation.java
index ec7185a..7f15cd9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/RenderedAdjustedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/RenderedAdjustedFacetForParameterLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.RenderDay;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/TypicalLengthFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/TypicalLengthFacetForParameterLayoutAnnotation.java
index 46db002..5adaa52 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/TypicalLengthFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/TypicalLengthFacetForParameterLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ParameterLayout;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index adb0ce5..05db0f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.Pattern;
import org.springframework.core.MethodParameter;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
index 706dc12..f89e522 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.parameter.fileaccept;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
index 3657c98..39da49c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.core.metamodel.facets.param.parameter.mandatory;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/maxlen/MaxLengthFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/maxlen/MaxLengthFacetForParameterAnnotation.java
index 50d1616..4db0f1b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/maxlen/MaxLengthFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/maxlen/MaxLengthFacetForParameterAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.parameter.maxlen;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
index c987175..28c38b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
index d7a482f..1c57ff7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.param.parameter.regex;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Parameter;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
index 3f5ba06..894a89c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
index 82bb3f3..654b774 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.disabled.inferred;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacet.java
index dfa32cc..4e73e27 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.projection;
-import org.apache.isis.applib.annotations.Projecting;
+import org.apache.isis.applib.annotation.Projecting;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
public interface ProjectingFacet extends SingleValueFacet<Projecting> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetFromPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetFromPropertyAnnotation.java
index 5358d1f..b0c8711 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetFromPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/projection/ProjectingFacetFromPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.projection;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Projecting;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Projecting;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 423fb50..4a0f8b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -23,8 +23,8 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.validation.constraints.Pattern;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
index 0e4ccf2..e8985f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
@@ -20,9 +20,9 @@ package org.apache.isis.core.metamodel.facets.properties.property.disabled;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Editing;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotationInvertedSemantics.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotationInvertedSemantics.java
index ab83de5..8e05256 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotationInvertedSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotationInvertedSemantics.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.property.disabled;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacet.java
index 7e8bf1c..e7b6589 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacet.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.property.entitychangepublishing;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetAbstract.java
index 31a82f2..7b14f87 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.entitychangepu
import java.util.Objects;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation.java
index 87e4ac7..199b098 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/entitychangepublishing/EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.property.entitychangepu
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
index 775ee81..f10d413 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.fileaccept;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
index 6ef06ef..0deddce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.property.hidden;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
index 441ffe9..f8288ed 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.property.mandatory;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/maxlength/MaxLengthFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/maxlength/MaxLengthFacetForPropertyAnnotation.java
index f37755b..4aee2aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/maxlength/MaxLengthFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/maxlength/MaxLengthFacetForPropertyAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.maxlength;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 1d51439..1fee027 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.modify;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
index 7f0788e..21f94a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
index 9f83216..00e801e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.property.regex;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/snapshot/SnapshotExcludeFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/snapshot/SnapshotExcludeFacetForPropertyAnnotation.java
index 97e0a89..8c925ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/snapshot/SnapshotExcludeFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/snapshot/SnapshotExcludeFacetForPropertyAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.property.snapshot;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Snapshot;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacet;
import org.apache.isis.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
index 0afd90f..0ed2760 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetSimple;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
index 0da2a1a..b3d2952 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutAnnotation.java
index 16b0299..a661f53 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
index 910e7bc..5c64bd7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java
index c7b3d75..4f8de0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.LabelPosition;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
index 1d949a3..83f991c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.LabelPosition;
+import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java
index 17f28e0..2aa5943 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
index aee361b..8e69e2c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index fb12a61..86a6a47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.PromptStyle;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.base._Optionals;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyXml.java
index 2956349..de53221 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.annotations.PromptStyle;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
index ea9806d..59cd4a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java
index 184eeec..e51b5b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.RenderDay;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java
index ce28da2..e2a9b6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutAnnotation.java
index da2bfc8..f761b09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Repainting;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.properties.renderunchanged.UnchangingFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyXml.java
index 578c75a..51b8f6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyXml.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Repainting;
+import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.properties.renderunchanged.UnchangingFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/LogicalTypeFacetForValueAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/LogicalTypeFacetForValueAnnotation.java
index 0c6e5af..a67f365 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/LogicalTypeFacetForValueAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/LogicalTypeFacetForValueAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.annotation;
import java.util.Optional;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/ValueAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/ValueAnnotationFacetFactory.java
index a1b5d24..fc0a857 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/ValueAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/annotation/ValueAnnotationFacetFactory.java
@@ -43,7 +43,7 @@ implements
val facetHolder = processClassContext.getFacetHolder();
// @Value(logicalTypeName=...)
- val valueIfAny = processClassContext.synthesizeOnType(org.apache.isis.applib.annotations.Value.class);
+ val valueIfAny = processClassContext.synthesizeOnType(org.apache.isis.applib.annotation.Value.class);
addFacetIfPresent(LogicalTypeFacetForValueAnnotation.create(valueIfAny, cls, facetHolder));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateFormatStyleFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateFormatStyleFacetFromValueSemanticsAnnotation.java
index e741951..c4b8001 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateFormatStyleFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateFormatStyleFacetFromValueSemanticsAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.time.format.FormatStyle;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.DateFormatStyleFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.DateFormatStyleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateRenderAdjustFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateRenderAdjustFacetFromValueSemanticsAnnotation.java
index 6e96afa..62481b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateRenderAdjustFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/DateRenderAdjustFacetFromValueSemanticsAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromValueSemanticsAnnotation.java
index beb79f2..455ce61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromValueSemanticsAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromValueSemanticsAnnotation.java
index 1aa1c32..ae84d6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromValueSemanticsAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinFractionalDigitsFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinFractionalDigitsFacetFromValueSemanticsAnnotation.java
index f7c91e4..f2aeb5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinFractionalDigitsFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinFractionalDigitsFacetFromValueSemanticsAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MinFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MinFractionalDigitsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinIntegerDigitsFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinIntegerDigitsFacetFromValueSemanticsAnnotation.java
index 5b459b8..e63d60a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinIntegerDigitsFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/MinIntegerDigitsFacetFromValueSemanticsAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MinIntegerDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MinIntegerDigitsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatPrecisionFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatPrecisionFacetFromValueSemanticsAnnotation.java
index 791b93d..d6d99a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatPrecisionFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatPrecisionFacetFromValueSemanticsAnnotation.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.TimePrecision;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.TimePrecision;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.TimeFormatPrecisionFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.TimeFormatPrecisionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatStyleFacetFromValueSemanticsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatStyleFacetFromValueSemanticsAnnotation.java
index 124cd15..6a00a16 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatStyleFacetFromValueSemanticsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/TimeFormatStyleFacetFromValueSemanticsAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.time.format.FormatStyle;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.TimeFormatStyleFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.temporalformat.TimeFormatStyleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
index fabf4c0..9895c7c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.validation.constraints.Digits;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
index 5e838b1..c07fad5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.isis.applib.annotations.ValueSemantics;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.valuesemantics.ValueSemanticsSelectingFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
index 8c45a90..9562cb0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
@@ -23,12 +23,12 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Publishing;
-import org.apache.isis.applib.annotations.RestrictTo;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.graph.tree.TreeNode;
import org.apache.isis.applib.graph.tree.TreePath;
import org.apache.isis.applib.id.LogicalType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
index 8c97a30..f455d4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.schema.metamodel.v2.Action;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
index 1aa9f29..761a184 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.schema.metamodel.v2.Collection;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
index 82db365..32aa0a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.schema.metamodel.v2.FacetAttr;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
index 2bb0c03..060a05d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.schema.metamodel.v2.FacetHolder.Facets;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
index 5fbbd40..abeb7b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.schema.metamodel.v2.Facet;
import org.apache.isis.schema.metamodel.v2.FacetAttr;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
index f5a834f..cc3dc0e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
@@ -26,11 +26,11 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.Navigable;
-import org.apache.isis.applib.annotations.ObjectSupport;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.Navigable;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
index 327c7cd..3715d42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.schema.metamodel.v2.Param;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
index 7803e96..629a88a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
import lombok.Setter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
index 3de3c29..cbe53d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.collections._Streams;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
index 4a4faa6..6c027f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.AccessEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
index 95f4e39..cbb1fad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionArgumentUsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
index eebf958..3efb747 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionArgumentVisibilityEvent;
import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
index 230bfce..de7de36 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
index e074d03..390d59b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
index bdabbf2..c072173 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.CollectionUsabilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
index 3f6a519..0690049 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index e85f6ba..cd87a4c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
index 7a63457..44505ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ObjectVisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
index 8ec353b..5bb3ac8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
index c770c18..c75e182 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
index 6e828ec..0786039 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
index 36a6d4b..eee86f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import java.util.function.Supplier;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
index ed85af8..ab32499 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
index 9f44845..0e30833 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Either;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
index 62c16cd..af8b1cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Either;
import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
index 3d31fbb..142b07a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.routing.RoutingService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
index 927f31e..25450ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableModel;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
index 8c070e4..56b1edd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.function.BiFunction;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.Veto;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
index 0d089e3..d517a09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.binding.Observable;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.binding._Observables;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
index e7388f5..e87cf5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Either;
import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/nonscalar/DataTableModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
index fb28e10..cede043 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
@@ -28,7 +28,7 @@ import java.util.function.Supplier;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.binding._BindableAbstract;
import org.apache.isis.commons.internal.binding._Bindables;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
index da284ba..01c9394 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
@@ -20,10 +20,10 @@ package org.apache.isis.core.metamodel.layout;
import java.util.Comparator;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.LabelPosition;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
index 5973b36..02a60e5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Domain;
+import org.apache.isis.applib.annotation.Domain;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
@@ -50,7 +50,7 @@ import lombok.val;
/**
* @since 2.0
- * @see org.apache.isis.applib.annotations.Domain.Include
+ * @see org.apache.isis.applib.annotation.Domain.Include
*/
public class DomainIncludeAnnotationEnforcesMetamodelContributionValidator
extends MetaModelVisitingValidatorAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
index b695378..c75f833 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
@@ -26,9 +26,9 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Domain;
-import org.apache.isis.applib.annotations.Introspection.EncapsulationPolicy;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Domain;
+import org.apache.isis.applib.annotation.Introspection.EncapsulationPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.functions._Predicates;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
index 026c57a..67baeaf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.create.ObjectCreator;
import org.apache.isis.core.metamodel.objectmanager.detach.ObjectDetacher;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
index 326c504..20fd593 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
@@ -22,8 +22,8 @@ import java.lang.reflect.Method;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index 267bf86..b28e0c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -23,7 +23,7 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
index b9c91fb..98de5d9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
@@ -24,8 +24,8 @@ import java.util.OptionalInt;
import java.util.SortedSet;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.applib.annotations.SemanticsOf;
-import org.apache.isis.applib.annotations.Value;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 57f5340..d32dbfb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -22,8 +22,8 @@ import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import lombok.val;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.appfeat.*;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index 6e567c5..cef2416 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.services.classsubstitutor;
import java.util.Objects;
import java.util.Set;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index 6c480cb..a01309e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -22,7 +22,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.graph.tree.TreeAdapter;
@Component
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
index 1d70707..3c22d03 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
@@ -28,7 +28,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
index 8488d0f..5a5894d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
@@ -23,7 +23,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.core.config.beans.IsisBeanMetaData;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index eeb285a..693a6cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -27,7 +27,7 @@ import javax.inject.Named;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.functions._Predicates;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutor.Substitution;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
index 5a21811..e5245c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
index 9bff5c9..ae325ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
@@ -24,7 +24,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.exceptions.RecoverableException;
import org.apache.isis.applib.services.exceprecog.Category;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 99e5133..7d14b76 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -32,7 +32,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridLoaderService;
import org.apache.isis.applib.services.message.MessageService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
index 2bfe65a..02583f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -28,7 +28,7 @@ import javax.xml.bind.JAXBException;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
import org.apache.isis.applib.services.grid.GridSystemService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index a159a8c..9378dbc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -29,7 +29,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridLoaderService;
import org.apache.isis.applib.services.grid.GridService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 6e65b2d..887eaa3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.inject.Inject;
-import org.apache.isis.applib.annotations.Programmatic;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
@@ -233,15 +233,15 @@ implements GridSystemService<G> {
// fix up the action position if required
if(actionLayoutDataOwner instanceof FieldSet) {
if(actionLayoutData.getPosition() == null ||
- actionLayoutData.getPosition() == org.apache.isis.applib.annotations.ActionLayout.Position.BELOW ||
- actionLayoutData.getPosition() == org.apache.isis.applib.annotations.ActionLayout.Position.RIGHT) {
- actionLayoutData.setPosition(org.apache.isis.applib.annotations.ActionLayout.Position.PANEL);
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.BELOW ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.RIGHT) {
+ actionLayoutData.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.PANEL);
}
} else if(actionLayoutDataOwner instanceof PropertyLayoutData) {
if(actionLayoutData.getPosition() == null ||
- actionLayoutData.getPosition() == org.apache.isis.applib.annotations.ActionLayout.Position.PANEL_DROPDOWN ||
- actionLayoutData.getPosition() == org.apache.isis.applib.annotations.ActionLayout.Position.PANEL) {
- actionLayoutData.setPosition(org.apache.isis.applib.annotations.ActionLayout.Position.BELOW);
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL_DROPDOWN ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL) {
+ actionLayoutData.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.BELOW);
}
} else {
// doesn't do anything for DomainObject or Collection
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
index 92dfef3..451d309 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
@@ -35,8 +35,8 @@ import javax.inject.Provider;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/package-info.java
index c41b46c..1bd3c2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/homepage/package-info.java
@@ -19,7 +19,7 @@
/**
* The {@link org.apache.isis.applib.services.homepage.HomePageResolverService} service simply provides access
- * to the home page object (if any) annotated with {@link org.apache.isis.applib.annotations.HomePage @HomePage}.
+ * to the home page object (if any) annotated with {@link org.apache.isis.applib.annotation.HomePage @HomePage}.
*
* p/rgsvc.html#_rgsvc_application-layer-spi_HomePageProviderService">Reference guide</a>
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index af6ae84..7d69e7b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -28,7 +28,7 @@ import javax.xml.bind.Marshaller;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.applib.services.grid.GridService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 9852687..7ca2e06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/ExecutionPublisher.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/ExecutionPublisher.java
index 44129b6..197e043 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/ExecutionPublisher.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/ExecutionPublisher.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.services.publishing;
import java.util.function.Supplier;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Property;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 07b2b88..c6f75c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -30,7 +30,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
index 5d13f0d..a77e196 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
index 4d6927a..20e05ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
@@ -28,8 +28,8 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.PropertyLayout;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
import org.apache.isis.commons.internal.base._Text;
import org.apache.isis.commons.internal.resources._Resources;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index ff7eb50..748f294 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.metamodel.facets.object.title.TitleRenderRequest;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index 5e8c547..87307bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 75ee285..b153d2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -24,10 +24,10 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.PromptStyle;
-import org.apache.isis.applib.annotations.SemanticsOf;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index 716eb16..fb1603f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -25,7 +25,7 @@ import java.util.function.Predicate;
import javax.enterprise.inject.Vetoed;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index adbf4cf..7f67e5f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import java.util.OptionalInt;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.base._Strings;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/LogicalTypeResolver.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/LogicalTypeResolver.java
index 50ab18e..eea39ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/LogicalTypeResolver.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/LogicalTypeResolver.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.specloader;
import java.util.Optional;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
index f8a9fb0..120ff5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index 0cd9c3a..c16b75c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.applib.services.menu.MenuBarsService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index 85d400d..68650c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -26,7 +26,7 @@ import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index cd054f2..d780a84 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -31,10 +31,10 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.Nature;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 51f883a..86d7f4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -23,10 +23,10 @@ import java.util.UUID;
import java.util.function.Predicate;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.SemanticsOf;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.exceptions.RecoverableException;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index cdce572..cf15f46 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Domain;
-import org.apache.isis.applib.annotations.DomainObject;
+import org.apache.isis.applib.annotation.Domain;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.collections.CanVector;
@@ -47,7 +47,7 @@ extends ObjectActionDefault
implements MixedInMember {
/**
- * The type of the mixin (providing the action), eg annotated with @{@link DomainObject DomainObject}#{@link DomainObject#nature() nature} of {@link org.apache.isis.applib.annotations.Nature#MIXIN MIXIN}.
+ * The type of the mixin (providing the action), eg annotated with @{@link DomainObject DomainObject}#{@link DomainObject#nature() nature} of {@link org.apache.isis.applib.annotation.Nature#MIXIN MIXIN}.
*/
private final Class<?> mixinType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 7922e68..319f254 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -25,7 +25,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 81c7564..9f3779b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
import javax.enterprise.inject.Vetoed;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index d48161b..e645c39 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Collection;
-import org.apache.isis.applib.annotations.CollectionLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.core.metamodel.commons.ToString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 68e314a..4b658bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Domain;
+import org.apache.isis.applib.annotation.Domain;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.reflection._Annotations;
@@ -48,7 +48,7 @@ extends OneToManyAssociationDefault
implements MixedInMember {
/**
- * The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotations.Mixin}.
+ * The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
*/
private final Class<?> mixinType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index 9ca6335..c1ab3b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index e89485c..92968c7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Domain;
+import org.apache.isis.applib.annotation.Domain;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.reflection._Annotations;
@@ -45,7 +45,7 @@ extends OneToOneAssociationDefault
implements MixedInMember {
/**
- * The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotations.Mixin}.
+ * The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
*/
private final Class<?> mixinType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 8ad6b01..a24f384 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -29,7 +29,7 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.collections.ImmutableEnumSet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
index a0a022e..0df6665 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
@@ -29,7 +29,7 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
import org.apache.isis.applib.services.tablecol.TableColumnVisibilityService;
import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java
index 802e25c..95fb8c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.valuesemantics;
import java.lang.reflect.Method;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
index 121d988..e84e3ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
@@ -31,7 +31,7 @@ import javax.inject.Inject;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotations.TimePrecision;
+import org.apache.isis.applib.annotation.TimePrecision;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.applib.value.semantics.EncodingException;
import org.apache.isis.applib.value.semantics.TemporalValueSemantics;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
index d95bc24..388fbf9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java
@@ -29,8 +29,8 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ClassUtils;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.PriorityPrecedence;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.value.semantics.ValueSemanticsProvider;
import org.apache.isis.applib.value.semantics.ValueSemanticsResolver;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 6af3e88..0dec4da 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -25,7 +25,7 @@ import org.jmock.Expectations;
import org.junit.Rule;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
+import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.iactn.InteractionProvider;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
index eeda74c..ea641d4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
@@ -26,8 +26,8 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.reflection._Annotations;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
index 2cd3959..5c81339 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
index ff3bf4b..df0f5f0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
@@ -24,8 +24,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index a3d7857..a2c2439 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
index 11e575a..7a1bb15 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNull;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
@@ -41,7 +41,7 @@ public class ActionAnnotationFacetFactoryTest_RestrictTo extends ActionAnnotatio
public void whenRestrictedToPrototyping() {
class Customer {
- @Action(restrictTo = org.apache.isis.applib.annotations.RestrictTo.PROTOTYPING)
+ @Action(restrictTo = org.apache.isis.applib.annotation.RestrictTo.PROTOTYPING)
public void someAction() {
}
}
@@ -64,7 +64,7 @@ public class ActionAnnotationFacetFactoryTest_RestrictTo extends ActionAnnotatio
public void whenRestrictedToNoRestriction() {
class Customer {
- @Action(restrictTo = org.apache.isis.applib.annotations.RestrictTo.NO_RESTRICTIONS)
+ @Action(restrictTo = org.apache.isis.applib.annotation.RestrictTo.NO_RESTRICTIONS)
public void someAction() {
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
index 9b5fe7e..63ea924 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
@@ -24,8 +24,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
index adb9e34..47210d9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.annotations.Action;
+import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromArray;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
index 0883c2f..c062eba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.Publishing;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
index 2b39c03..b3609ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -155,7 +155,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
public void given_asConfigured_and_configurationSetToIgnoreQueryOnly_andSafeSemantics_thenNone() {
class Customer {
- @Action(executionPublishing = org.apache.isis.applib.annotations.Publishing.AS_CONFIGURED)
+ @Action(executionPublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
public void someAction() {
}
}
@@ -179,7 +179,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
// given
class Customer {
@Action(
- executionPublishing = org.apache.isis.applib.annotations.Publishing.AS_CONFIGURED
+ executionPublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED
)
public void someAction() {
}
@@ -207,7 +207,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
public void given_asConfigured_and_configurationSetToIgnoreQueryOnly_andNoSemantics_thenException() {
class Customer {
- @Action(executionPublishing = org.apache.isis.applib.annotations.Publishing.AS_CONFIGURED)
+ @Action(executionPublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
public void someAction() {
}
}
@@ -223,7 +223,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
public void given_asConfigured_and_configurationSetToNone_thenNone() {
class Customer {
- @Action(executionPublishing = org.apache.isis.applib.annotations.Publishing.AS_CONFIGURED)
+ @Action(executionPublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
public void someAction() {
}
}
@@ -246,7 +246,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
// given
class Customer {
@Action(
- executionPublishing = org.apache.isis.applib.annotations.Publishing.AS_CONFIGURED
+ executionPublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED
)
public void someAction() {
}
@@ -273,7 +273,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
// given
class Customer {
@Action(
- executionPublishing = org.apache.isis.applib.annotations.Publishing.ENABLED
+ executionPublishing = org.apache.isis.applib.annotation.Publishing.ENABLED
)
public void someAction() {
}
@@ -299,7 +299,7 @@ public class ActionAnnotationFacetFactoryTest_executionPublishing extends Action
// given
class Customer {
@Action(
- executionPublishing = org.apache.isis.applib.annotations.Publishing.DISABLED
+ executionPublishing = org.apache.isis.applib.annotation.Publishing.DISABLED
)
public void someAction() {
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java
index 5bf1f7e..76e6036 100644
... 28462 lines suppressed ...