You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 15:22:29 UTC
[isis] 15/21: ISIS-2259: fixes package for isis-core-commons
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c4b62b7e01b32fa000fe5dc2c52b4680c65d2311
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:08:06 2020 +0000
ISIS-2259: fixes package for isis-core-commons
---
.../java/org/apache/isis/applib/Identifier.java | 4 +-
.../isis/applib/NonRecoverableException.java | 4 +-
.../apache/isis/applib/RecoverableException.java | 4 +-
.../apache/isis/applib/client/SuppressionType.java | 4 +-
.../applib/events/domain/AbstractDomainEvent.java | 4 +-
.../isis/applib/events/domain/EventObjectBase.java | 4 +-
.../layout/menubars/bootstrap3/BS3MenuBars.java | 2 +-
.../isis/applib/mixins/dto/DtoMappingHelper.java | 2 +-
.../apache/isis/applib/query/QueryAbstract.java | 2 +-
.../services/appfeat/ApplicationMemberType.java | 2 +-
.../isis/applib/services/bookmark/Bookmark.java | 4 +-
.../applib/services/bookmark/BookmarkService.java | 6 +--
.../services/confview/ConfigurationProperty.java | 2 +-
.../services/conmap/ContentMappingService.java | 2 +-
.../exceprecog/ExceptionRecognizerAbstract.java | 4 +-
.../exceprecog/ExceptionRecognizerComposite.java | 2 +-
.../exceprecog/ExceptionRecognizerForType.java | 6 +--
.../applib/services/i18n/TranslatableString.java | 2 +-
.../isis/applib/services/iactn/Interaction.java | 4 +-
.../jaxb/CatalogingSchemaOutputResolver.java | 4 +-
.../isis/applib/services/jaxb/JaxbService.java | 6 +--
.../applib/services/layout/LayoutServiceMenu.java | 2 +-
.../services/metamodel/MetaModelService.java | 4 +-
.../services/metamodel/MetaModelServicesMenu.java | 6 +--
.../QueryResultsCacheDefault.java | 6 +--
.../applib/services/registry/ServiceRegistry.java | 12 +++---
.../applib/services/scratchpad/Scratchpad.java | 2 +-
.../services/urlencoding/UrlEncodingService.java | 4 +-
...rlEncodingServiceUsingBaseEncodingAbstract.java | 4 +-
.../UrlEncodingServiceWithCompression.java | 4 +-
.../isis/applib/spec/AbstractSpecification2.java | 2 +-
.../org/apache/isis/applib/tree/LazyTreeNode.java | 4 +-
.../java/org/apache/isis/applib/tree/TreeNode.java | 2 +-
.../java/org/apache/isis/applib/util/Enums.java | 2 +-
.../java/org/apache/isis/applib/util/Equality.java | 4 +-
.../java/org/apache/isis/applib/util/Hashing.java | 2 +-
.../org/apache/isis/applib/util/JaxbAdapters.java | 4 +-
.../java/org/apache/isis/applib/util/JaxbUtil.java | 6 +--
.../isis/applib/util/ObjectContract_Parser.java | 4 +-
.../apache/isis/applib/util/ObjectContracts.java | 4 +-
.../org/apache/isis/applib/util/ReasonBuffer2.java | 2 +-
.../org/apache/isis/applib/util/TitleBuffer.java | 2 +-
.../java/org/apache/isis/applib/util/ToString.java | 2 +-
.../org/apache/isis/applib/util/ZipWriter.java | 2 +-
.../isis/applib/util/schema/ChangesDtoUtils.java | 2 +-
.../isis/applib/util/schema/CommandDtoUtils.java | 2 +-
.../isis/applib/util/schema/CommonDtoUtils.java | 12 +++---
.../applib/util/schema/InteractionDtoUtils.java | 6 +--
.../util/schema/MemberExecutionDtoUtils.java | 2 +-
.../apache/isis/applib/value/BlobClobFactory.java | 2 +-
.../applib/services/urlencoding/MementosTest.java | 8 ++--
.../XmlSnapshotServiceAbstractTest.java | 2 +-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
core/codegen-bytebuddy/pom.xml | 4 +-
.../bytebuddy/IsisModuleCodegenByteBuddy.java | 2 +-
.../services/ProxyFactoryServiceByteBuddy.java | 12 +++---
.../commons/internal/exceptions/package-info.java | 28 -------------
.../commons/internal/functions/package-info.java | 28 -------------
.../commons/internal/memento/package-info.java | 28 -------------
.../commons/internal/reflection/package-info.java | 28 -------------
.../commons/internal/resources/package-info.java | 28 -------------
.../isis/{ => core}/commons/IsisModuleCommons.java | 4 +-
.../isis/{ => core}/commons/collections/Can.java | 6 +--
.../{ => core}/commons/collections/Can_Empty.java | 4 +-
.../commons/collections/Can_Multiple.java | 4 +-
.../commons/collections/Can_Singleton.java | 4 +-
.../commons/collections/Cardinality.java | 2 +-
.../commons/concurrent/AwaitableLatch.java | 4 +-
.../commons/exceptions/ExceptionUtils.java | 4 +-
.../exceptions/IsisApplicationException.java | 2 +-
.../commons/exceptions/IsisException.java | 2 +-
.../exceptions/UnexpectedCallException.java | 2 +-
.../commons/exceptions/UnknownTypeException.java | 2 +-
.../commons/exceptions/package-info.java | 4 +-
.../commons/handler/ChainOfResponsibility.java | 2 +-
.../{ => core}/commons/internal/_Constants.java | 2 +-
.../commons/internal/assertions/_Assert.java | 4 +-
.../commons/internal/base/_Blackhole.java | 2 +-
.../{ => core}/commons/internal/base/_Bytes.java | 6 +--
.../internal/base/_Bytes_GZipCompressor.java | 2 +-
.../internal/base/_Bytes_GZipCompressorSmart.java | 4 +-
.../{ => core}/commons/internal/base/_Casts.java | 4 +-
.../{ => core}/commons/internal/base/_Either.java | 4 +-
.../{ => core}/commons/internal/base/_Lazy.java | 2 +-
.../commons/internal/base/_Lazy_Simple.java | 4 +-
.../commons/internal/base/_Lazy_ThreadSafe.java | 4 +-
.../commons/internal/base/_NullSafe.java | 2 +-
.../commons/internal/base/_Reduction.java | 4 +-
.../{ => core}/commons/internal/base/_Strings.java | 18 ++++-----
.../commons/internal/base/_Strings_FastSplit.java | 2 +-
.../internal/base/_Strings_HtmlEscaper.java | 6 +--
.../internal/base/_Strings_KeyValuePair.java | 10 ++---
.../internal/base/_Strings_NaturalNames.java | 2 +-
.../internal/base/_Strings_SplitIterator.java | 2 +-
.../{ => core}/commons/internal/base/_Timing.java | 2 +-
.../{ => core}/commons/internal/base/_Tuples.java | 2 +-
.../{ => core}/commons/internal/base/_With.java | 2 +-
.../commons/internal/base}/package-info.java | 2 +-
.../commons/internal/collections/_Arrays.java | 29 +++++++------
.../internal/collections/_Arrays_Collector.java | 4 +-
.../collections/_Arrays_CollectorUnknownSize.java | 4 +-
.../commons/internal/collections/_Collections.java | 11 +++--
.../collections/_Collections_Collector.java | 8 ++--
.../collections/_Collections_SortedSetOfList.java | 2 +-
.../commons/internal/collections/_Inbox.java | 2 +-
.../commons/internal/collections/_Lists.java | 11 +++--
.../commons/internal/collections/_Maps.java | 21 +++++-----
.../commons/internal/collections/_Multimaps.java | 19 +++++----
.../commons/internal/collections/_Sets.java | 12 +++---
.../commons/internal/collections/_Streams.java | 2 +-
.../internal/collections}/package-info.java | 2 +-
.../collections/snapshot/_VersionedList.java | 6 +--
.../commons/internal/compare/_Comparators.java | 2 +-
.../compare/_Comparators_SequenceCompare.java | 4 +-
.../commons/internal/compare}/package-info.java | 2 +-
.../internal/concurrent/_ConcurrentContext.java | 2 +-
.../internal/concurrent/_ConcurrentTask.java | 12 +++---
.../internal/concurrent/_ConcurrentTaskList.java | 6 +--
.../commons/internal/context/_Context.java | 47 +++++++++++-----------
.../internal/context/_Context_ThreadLocal.java | 19 +++++----
.../commons/internal/context/_Plugin.java | 15 ++++---
.../commons/internal/context}/package-info.java | 2 +-
.../{ => core}/commons/internal/debug/_Probe.java | 10 ++---
.../commons/internal/debug/package-info.java | 2 +-
.../internal/encoding/DataInputExtended.java | 2 +-
.../encoding/DataInputExtendedDecorator.java | 2 +-
.../internal/encoding/DataInputStreamExtended.java | 2 +-
.../internal/encoding/DataOutputExtended.java | 2 +-
.../encoding/DataOutputExtendedDecorator.java | 2 +-
.../encoding/DataOutputStreamExtended.java | 2 +-
.../internal/encoding/DebugDataInputExtended.java | 2 +-
.../internal/encoding/DebugDataOutputExtended.java | 2 +-
.../commons/internal/encoding/Encodable.java | 2 +-
.../internal/encoding/EncodingConstants.java | 2 +-
.../internal/encoding/FailedToDecodeException.java | 2 +-
.../encoding/FailedToDeserializeException.java | 2 +-
.../commons/internal/encoding/FieldType.java | 4 +-
.../internal/environment/DeploymentType.java | 2 +-
.../environment/IsisSystemEnvironment.java | 8 ++--
.../commons/internal/exceptions/_Exceptions.java | 36 ++++++++---------
.../commons/internal/exceptions}/package-info.java | 2 +-
.../factory/InstanceCreationClassException.java | 4 +-
.../factory/InstanceCreationException.java | 4 +-
.../commons/internal/factory/InstanceUtil.java | 8 ++--
.../factory/UnavailableClassException.java | 4 +-
.../commons/internal/factory/package-info.java | 4 +-
.../commons/internal/functions/_Functions.java | 2 +-
.../_Functions_IndexAwareFunctionAdapter.java | 4 +-
.../commons/internal/functions/_Predicates.java | 4 +-
.../commons/internal/functions}/package-info.java | 2 +-
.../{ => core}/commons/internal/ioc/BeanSort.java | 2 +-
.../commons/internal/ioc/IocContainer.java | 6 +--
.../commons/internal/ioc/ManagedBeanAdapter.java | 4 +-
.../commons/internal/ioc/PriorityConstants.java | 2 +-
.../commons/internal/ioc/cdi/BeanAdapterCDI.java | 6 +--
.../commons/internal/ioc/cdi/CdiPlugin.java | 4 +-
.../{ => core}/commons/internal/ioc/cdi/_CDI.java | 25 ++++++------
.../commons/internal/ioc/cdi/_CDI_Lifecycle.java | 4 +-
.../internal/ioc/spring/BeanAdapterSpring.java | 6 +--
.../commons/internal/ioc/spring/EventSpring.java | 4 +-
.../internal/ioc/spring/IocContainerSpring.java | 19 +++++----
.../commons/internal/ioc/spring/_Spring.java | 10 ++---
.../commons/internal/memento/_Mementos.java | 6 +--
.../internal/memento/_Mementos_MementoDefault.java | 31 +++++++-------
.../commons/internal/memento}/package-info.java | 2 +-
.../{ => core}/commons/internal/package-info.java | 2 +-
.../internal/plugins/PluginResolveException.java | 2 +-
.../internal/plugins/codegen/ProxyFactory.java | 2 +-
.../plugins/codegen/ProxyFactoryService.java | 2 +-
.../plugins/ioc/ConversationContextHandle.java | 2 +-
.../plugins/ioc/ConversationContextService.java | 2 +-
.../ioc/ConversationContextServiceDefault.java | 2 +-
.../commons/internal/reflection/_Annotations.java | 4 +-
.../internal/reflection/_AnnotationsLegacy.java | 13 +++---
.../reflection/_Annotations_AttributeMethods.java | 2 +-
.../reflection/_Annotations_SyntCache.java | 4 +-
...nthesizedMergedAnnotationInvocationHandler.java | 4 +-
.../commons/internal/reflection/_MethodCache.java | 11 +++--
.../commons/internal/reflection/_Reflect.java | 31 +++++++-------
.../commons/internal/reflection}/package-info.java | 2 +-
.../commons/internal/resources/_Json.java | 4 +-
.../commons/internal/resources/_Resources.java | 19 +++++----
.../commons/internal/resources}/package-info.java | 2 +-
.../commons/internal/url/UrlDecoderUtil.java | 2 +-
.../handlers/ChainOfResponsibilityTest.java | 4 +-
.../commons/internal/base/BytesTest.java | 4 +-
.../commons/internal/base/NullSafeTest.java | 2 +-
.../commons/internal/base/ReductionTest.java | 4 +-
.../commons/internal/base/StringsTest.java | 4 +-
.../{ => core}/commons/internal/cdi/CDITest.java | 7 ++--
.../internal/cdi/ValidQualifierForTesting.java | 2 +-
.../commons/internal/collections/_ArraysTest.java | 2 +-
.../commons/internal/collections/_MapsTest.java | 4 +-
.../collections/snapshot/VersionedListTest.java | 2 +-
.../commons/internal/compare/ComparatorsTest.java | 4 +-
.../concurrent/ConcurrentTaskListTest.java | 2 +-
.../commons/internal/context/ContextTest.java | 2 +-
.../encoding/ByteEncoderDecoderRoundtripTest.java | 2 +-
.../commons/internal/resources/ResourcesTest.java | 2 +-
.../commons/internal/strings/FormatTest.java | 2 +-
.../apache/isis/config/ConfigurationConstants.java | 2 +-
.../org/apache/isis/config/IsisConfiguration.java | 4 +-
.../org/apache/isis/config/IsisModuleConfig.java | 2 +-
.../isis/config/beans/IsisBeanTypeRegistry.java | 16 ++++----
.../org/apache/isis/config/beans/TypeMetaData.java | 6 +--
.../isis/config/messages/MessageRegistry.java | 2 +-
.../metamodel/specloader/IntrospectionMode.java | 4 +-
.../org/apache/isis/config/util/ConfigUtil.java | 2 +-
.../config/viewer/wicket/WebAppContextPath.java | 4 +-
.../commons/internal/reflection/ReflectTest.java | 10 ++---
.../BidirectionalRelationshipContractTestAll.java | 2 +-
.../comparable/CategorizedDomainObject.java | 2 +-
.../ImposteriserTestUsingCodegenPlugin.java | 2 +-
.../adapter/oid/ObjectPersistenceException.java | 2 +-
.../isis/metamodel/adapter/oid/Oid_Marshaller.java | 12 +++---
.../isis/metamodel/adapter/oid/Oid_Parented.java | 2 +-
.../isis/metamodel/adapter/oid/Oid_Root.java | 4 +-
.../isis/metamodel/adapter/oid/ParentedOid.java | 2 +-
.../apache/isis/metamodel/adapter/oid/RootOid.java | 2 +-
.../isis/metamodel/commons/ArrayExtensions.java | 2 +-
.../isis/metamodel/commons/ClassExtensions.java | 8 ++--
.../apache/isis/metamodel/commons/ClassUtil.java | 12 +++---
.../isis/metamodel/commons/ListExtensions.java | 6 +--
.../apache/isis/metamodel/commons/LocaleUtil.java | 2 +-
.../commons/MethodInvocationPreprocessor.java | 10 ++---
.../isis/metamodel/commons/ObjectExtensions.java | 2 +-
.../isis/metamodel/commons/ResourceUtil.java | 2 +-
.../isis/metamodel/commons/StringExtensions.java | 4 +-
.../metamodel/commons/ThrowableExtensions.java | 2 +-
.../isis/metamodel/consent/InteractionAdvisor.java | 2 +-
.../org/apache/isis/metamodel/consent/Veto.java | 2 +-
.../isis/metamodel/context/MetaModelContext.java | 3 +-
.../context/MetaModelContext_usingIoc.java | 11 +++--
.../isis/metamodel/context/MetaModelContexts.java | 2 +-
.../metamodel/exceptions/MetaModelException.java | 2 +-
.../persistence/ObjectPersistenceException.java | 2 +-
.../isis/metamodel/facetapi/FacetAbstract.java | 6 +--
.../isis/metamodel/facetapi/FacetHolderImpl.java | 10 ++---
.../apache/isis/metamodel/facets/Annotations.java | 12 +++---
.../isis/metamodel/facets/CollectionUtils.java | 10 ++---
.../isis/metamodel/facets/DependentArgUtils.java | 4 +-
.../isis/metamodel/facets/DomainEventHelper.java | 6 +--
.../apache/isis/metamodel/facets/FacetFactory.java | 4 +-
.../isis/metamodel/facets/FacetedMethod.java | 4 +-
.../isis/metamodel/facets/ImperativeFacet.java | 2 +-
.../isis/metamodel/facets/MethodFinderUtils.java | 2 +-
.../facets/MethodPrefixBasedFacetFactory.java | 2 +-
.../MethodPrefixBasedFacetFactoryAbstract.java | 4 +-
.../facets/OrphanedSupportingMethodValidator.java | 4 +-
...rCollectionIdentifyingFacetFactoryAbstract.java | 4 +-
.../facets/actcoll/typeof/TypeOfFacet.java | 4 +-
.../action/ActionAnnotationFacetFactory.java | 4 +-
.../action/invocation/ActionInvocationFacet.java | 1 -
...ctionInvocationFacetForDomainEventAbstract.java | 12 +++---
.../actions/action/invocation/CommandUtil.java | 5 +--
.../PrototypeFacetForActionAnnotation.java | 2 +-
.../ActionDefaultsFacetViaMethodFactory.java | 4 +-
.../FileAcceptFacetForActionAnnotation.java | 2 +-
.../annotation/HomePageFacetAnnotationFactory.java | 4 +-
.../CssClassFaFacetForActionLayoutAnnotation.java | 2 +-
.../layout/CssClassFaFacetForActionXml.java | 2 +-
.../CssClassFacetForActionLayoutAnnotation.java | 2 +-
.../actions/layout/CssClassFacetForActionXml.java | 2 +-
.../DescribedAsFacetForActionLayoutAnnotation.java | 2 +-
.../layout/DescribedAsFacetForActionXml.java | 2 +-
.../NamedFacetForActionLayoutAnnotation.java | 2 +-
.../actions/layout/NamedFacetForActionXml.java | 2 +-
.../actions/prototype/PrototypeFacetAbstract.java | 2 +-
.../actions/validate/ActionValidationFacet.java | 1 -
.../method/ActionValidationFacetViaMethod.java | 1 -
.../ActionValidationFacetViaMethodFactory.java | 2 +-
.../facets/all/deficiencies/DeficiencyFacet.java | 4 +-
.../facets/all/i18n/TranslationFacetFactory.java | 2 +-
.../CollectionAccessorFacetViaAccessor.java | 2 +-
.../CollectionAccessorFacetViaAccessorFactory.java | 2 +-
.../clear/CollectionClearFacetFactory.java | 2 +-
.../CollectionAnnotationFacetFactory.java | 2 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 2 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 4 +-
.../javautilcollection/CollectionFacetFactory.java | 4 +-
.../javautilcollection/JavaArrayFacet.java | 6 +--
.../javautilcollection/JavaCollectionFacet.java | 2 +-
...CssClassFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/CssClassFacetForCollectionXml.java | 2 +-
...aultViewFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/DefaultViewFacetForCollectionXml.java | 2 +-
...cribedAsFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/DescribedAsFacetForCollectionXml.java | 2 +-
.../NamedFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/NamedFacetForCollectionXml.java | 2 +-
...SortedByFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/SortedByFacetForCollectionXml.java | 2 +-
...tionAddToRemoveFromAndValidateFacetFactory.java | 2 +-
.../facets/collections/modify/CollectionFacet.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../cssclassfa/CssClassFaFacetAbstract.java | 4 +-
.../cssclassfa/annotprop/MixinInterceptor.java | 2 +-
.../disabled/DisabledFacetAbstractImpl.java | 2 +-
.../method/DisableForContextFacetViaMethod.java | 2 +-
.../DisableForContextFacetViaMethodFactory.java | 2 +-
.../HiddenFacetFromLayoutPropertiesAbstract.java | 2 +-
.../method/HideForContextFacetViaMethod.java | 2 +-
.../HideForContextFacetViaMethodFactory.java | 2 +-
.../members/order/MemberOrderFacetAbstract.java | 2 +-
.../callbacks/CreatedCallbackFacetFactory.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../object/callbacks/LoadCallbackFacetFactory.java | 4 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../callbacks/PersistCallbackFacetFactory.java | 4 +-
.../PersistCallbackViaSaveMethodFacetFactory.java | 4 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../callbacks/RemoveCallbackFacetFactory.java | 4 +-
.../RemoveCallbackViaDeleteMethodFacetFactory.java | 4 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../callbacks/UpdateCallbackFacetFactory.java | 4 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../callbacks/UpdatingCallbackFacetViaMethod.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...ingValueFacetUsingSemanticsProviderFactory.java | 2 +-
.../method/CssClassFacetMethodFactory.java | 2 +-
...ssClassFaFacetForDomainObjectLayoutFactory.java | 2 +-
.../CssClassFaFacetForViewModelLayoutFactory.java | 2 +-
.../object/defaults/DefaultsProviderUtil.java | 2 +-
.../annotcfg/DefaultedFacetAnnotation.java | 2 +-
...tedFacetAnnotationElseConfigurationFactory.java | 2 +-
.../DisabledObjectFacetViaMethodFactory.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 2 +-
.../AuditableFacetForDomainObjectAnnotation.java | 2 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 4 +-
.../editing/ImmutableFacetFromConfiguration.java | 2 +-
...ObjectSpecIdFacetForDomainObjectAnnotation.java | 2 +-
...lassFaFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../CssClassFaFacetForDomainObjectXml.java | 2 +-
...ssClassFaFacetForViewModelLayoutAnnotation.java | 2 +-
...sClassFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../CssClassFacetForDomainObjectXml.java | 2 +-
.../CssClassFacetForViewModelLayoutAnnotation.java | 2 +-
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...wModelLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...ibedAsFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../DescribedAsFacetForDomainObjectXml.java | 2 +-
...scribedAsFacetForViewModelLayoutAnnotation.java | 2 +-
.../DomainObjectLayoutFacetFactory.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...aViewModelLayoutAnnotationUsingIconUiEvent.java | 2 +-
.../NamedFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../NamedFacetForDomainObjectXml.java | 2 +-
.../NamedFacetForViewModelLayoutAnnotation.java | 2 +-
.../PluralFacetForDomainObjectXml.java | 2 +-
.../PluralFacetForViewModelLayoutAnnotation.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
...ViewModelLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../DomainServiceLayoutFacetFactory.java | 2 +-
.../encoder/EncodableFacetUsingEncoderDecoder.java | 2 +-
.../facets/object/facets/FacetsFacetAbstract.java | 4 +-
.../facets/object/grid/GridFacetFactory.java | 2 +-
.../method/HiddenObjectFacetViaMethodFactory.java | 2 +-
.../object/icon/method/IconFacetMethodFactory.java | 2 +-
.../RemoveAnnotatedMethodsFacetFactory.java | 6 +--
...oveDatanucleusPersistableTypesFacetFactory.java | 4 +-
.../ignore/javalang/RemoveMethodsFacetFactory.java | 4 +-
.../jdo/RemoveJdoEnhancementTypesFacetFactory.java | 4 +-
.../facets/object/layout/LayoutFacetFactory.java | 2 +-
.../mixin/MetaModelValidatorForMixinTypes.java | 2 +-
.../mixin/MixinFacetForDomainObjectAnnotation.java | 2 +-
.../object/mixin/MixinFacetForMixinAnnotation.java | 2 +-
.../NavigableParentAnnotationFacetFactory.java | 2 +-
.../method/NavigableParentFacetMethod.java | 2 +-
.../object/parseable/InvalidEntryException.java | 2 +-
.../facets/object/parseable/ParserUtil.java | 2 +-
.../object/parseable/TextEntryParseException.java | 2 +-
...ObjectFacetDeclarativeInitializingAbstract.java | 4 +-
.../recreatable/RecreatableObjectFacetFactory.java | 2 +-
.../annotation/TitleAnnotationFacetFactory.java | 4 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 4 +-
.../title/methods/TitleFacetViaMethodsFactory.java | 4 +-
.../method/ValidateObjectFacetMethodFactory.java | 2 +-
.../value/annotcfg/ValueFacetAnnotation.java | 2 +-
...ValueFacetAnnotationOrConfigurationFactory.java | 2 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 2 +-
.../value/vsp/ValueSemanticsProviderUtil.java | 4 +-
.../mandatory/MandatoryFacetAbstract.java | 2 +-
.../MustSatisfySpecificationFacetAbstract.java | 2 +-
.../ActionParameterAutoCompleteFacet.java | 1 -
.../ActionParameterAutoCompleteFacetViaMethod.java | 4 +-
...ParameterAutoCompleteFacetViaMethodFactory.java | 2 +-
.../param/choices/ActionParameterChoicesFacet.java | 1 -
.../choices/ActionParameterChoicesFacetNone.java | 1 -
...rameterChoicesFacetDerivedFromChoicesFacet.java | 3 +-
.../method/ActionChoicesFacetViaMethod.java | 2 +-
.../method/ActionChoicesFacetViaMethodFactory.java | 4 +-
.../ActionParameterChoicesFacetViaMethod.java | 4 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 2 +-
.../defaults/ActionParameterDefaultsFacet.java | 1 -
.../ActionParameterDefaultsFacetViaMethod.java | 1 -
...tionParameterDefaultsFacetViaMethodFactory.java | 4 +-
.../disable/ActionParameterDisabledFacet.java | 1 -
.../ActionParameterDisabledFacetViaMethod.java | 1 -
...tionParameterDisabledFacetViaMethodFactory.java | 2 +-
.../param/hide/ActionParameterHiddenFacet.java | 1 -
.../ActionParameterHiddenFacetViaMethod.java | 1 -
...ActionParameterHiddenFacetViaMethodFactory.java | 2 +-
.../CssClassFacetForParameterLayoutAnnotation.java | 2 +-
...scribedAsFacetForParameterLayoutAnnotation.java | 2 +-
.../NamedFacetForParameterLayoutAnnotation.java | 2 +-
.../FileAcceptFacetForParameterAnnotation.java | 2 +-
.../regex/RegExFacetForParameterAnnotation.java | 2 +-
.../RegExFacetForPatternAnnotationOnParameter.java | 2 +-
...onParameterValidationFacetViaMethodFactory.java | 2 +-
.../PropertyAccessorFacetViaAccessorFactory.java | 4 +-
.../method/PropertyAutoCompleteFacetMethod.java | 2 +-
.../PropertyAutoCompleteFacetMethodFactory.java | 2 +-
...ropertyChoicesFacetDerivedFromChoicesFacet.java | 2 +-
.../PropertyChoicesFacetViaMethodFactory.java | 2 +-
.../method/PropertyDefaultFacetViaMethod.java | 2 +-
.../PropertyDefaultFacetViaMethodFactory.java | 2 +-
.../FileAcceptFacetForPropertyAnnotation.java | 2 +-
.../modify/PropertyDomainEventFacetAbstract.java | 2 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 4 +-
.../RegExFacetForPatternAnnotationOnProperty.java | 2 +-
.../regex/RegExFacetForPropertyAnnotation.java | 2 +-
.../CssClassFacetForPropertyLayoutAnnotation.java | 2 +-
.../CssClassFacetForPropertyXml.java | 2 +-
...escribedAsFacetForPropertyLayoutAnnotation.java | 2 +-
.../DescribedAsFacetForPropertyXml.java | 2 +-
.../NamedFacetForPropertyLayoutAnnotation.java | 2 +-
.../propertylayout/NamedFacetForPropertyXml.java | 2 +-
.../update/PropertyModifyFacetFactory.java | 2 +-
.../update/PropertySetAndClearFacetFactory.java | 4 +-
.../PropertyValidateFacetViaMethodFactory.java | 2 +-
.../DateAndTimeValueSemanticsProviderAbstract.java | 2 +-
.../ValueSemanticsProviderAbstractTemporal.java | 4 +-
.../BigDecimalValueSemanticsProvider.java | 2 +-
.../value/blobs/BlobValueSemanticsProvider.java | 4 +-
.../BooleanValueSemanticsProviderAbstract.java | 2 +-
.../date/DateValueSemanticsProviderAbstract.java | 2 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 4 +-
.../value/datejodalocal/JodaLocalDateUtil.java | 2 +-
.../JodaLocalDateValueSemanticsProvider.java | 4 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 4 +-
...fsetDateTimeValueSemanticsProviderAbstract.java | 2 +-
...JodaDateTimeValueSemanticsProviderAbstract.java | 2 +-
.../datetimejodalocal/JodaLocalDateTimeUtil.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 4 +-
.../image/ImageValueSemanticsProviderAbstract.java | 4 +-
.../timesql/JavaSqlTimeValueSemanticsProvider.java | 2 +-
.../JavaSqlTimeStampValueSemanticsProvider.java | 2 +-
.../treenode/TreeNodeValueSemanticsProvider.java | 6 +--
.../metamodel/interactions/InteractionContext.java | 4 +-
.../isis/metamodel/layout/DeweyOrderSet.java | 6 +--
.../MemberOrderFacetComparator.java | 2 +-
.../objectmanager/create/ObjectCreator.java | 6 +--
.../create/ObjectCreator_builtinHandlers.java | 6 +--
.../objectmanager/identify/ObjectIdentifier.java | 6 +--
.../identify/ObjectIdentifier_builtinHandlers.java | 2 +-
.../metamodel/objectmanager/load/ObjectLoader.java | 6 +--
.../load/ObjectLoader_builtinHandlers.java | 6 +--
.../objectmanager/refresh/ObjectRefresher.java | 6 +--
.../refresh/ObjectRefresher_builtinHandlers.java | 2 +-
...meterDefaultsFacetFromAssociatedCollection.java | 2 +-
.../param/DeriveFacetsPostProcessor.java | 4 +-
.../isis/metamodel/progmodel/ProgrammingModel.java | 2 +-
.../progmodel/ProgrammingModelAbstract.java | 8 ++--
.../progmodel/ProgrammingModelInitFilter.java | 4 +-
.../dflt/ProgrammingModelFacetsJava8.java | 2 +-
.../metamodel/services/ServiceInjectorLegacy.java | 10 ++---
.../isis/metamodel/services/ServiceUtil.java | 2 +-
.../services/appfeat/ApplicationFeature.java | 2 +-
.../services/appfeat/ApplicationFeatureId.java | 6 +--
.../ApplicationFeatureRepositoryDefault.java | 10 ++---
.../classsubstitutor/ClassSubstitutorAbstract.java | 4 +-
.../classsubstitutor/ClassSubstitutorRegistry.java | 2 +-
.../command/CommandDtoServiceInternal.java | 1 -
.../events/MetamodelEventSupport_Spring.java | 2 +-
.../services/grid/GridLoaderServiceDefault.java | 8 ++--
.../services/grid/GridReaderUsingJaxb.java | 4 +-
.../services/grid/GridServiceDefault.java | 6 +--
.../services/grid/GridSystemServiceAbstract.java | 8 ++--
.../grid/bootstrap3/GridSystemServiceBS3.java | 14 +++----
.../services/homepage/HomePageAction.java | 1 -
.../ixn/InteractionDtoServiceInternal.java | 1 -
.../services/layout/LayoutServiceDefault.java | 4 +-
.../services/metamodel/DomainMemberDefault.java | 6 +--
.../services/metamodel/DomainModelDefault.java | 2 +-
.../services/metamodel/MetaModelExporter.java | 6 +--
.../metamodel/MetaModelServiceDefault.java | 4 +-
.../services/registry/ServiceRegistryDefault.java | 14 +++----
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../services/user/UserServiceDefault.java | 2 +-
.../isis/metamodel/spec/DomainModelException.java | 2 +-
.../apache/isis/metamodel/spec/ManagedObject.java | 10 ++---
.../apache/isis/metamodel/spec/ObjectSpecId.java | 2 +-
.../isis/metamodel/spec/ObjectSpecification.java | 7 ++--
.../isis/metamodel/spec/feature/ObjectAction.java | 10 ++---
.../spec/feature/ObjectActionContainer.java | 4 +-
.../spec/feature/ObjectActionParameter.java | 2 +-
.../metamodel/spec/feature/ObjectAssociation.java | 8 ++--
.../isis/metamodel/spec/feature/ObjectMember.java | 2 +-
.../isis/metamodel/specloader/CollectionUtils.java | 4 +-
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../specloader/ReflectiveActionException.java | 2 +-
.../specloader/SpecificationCacheDefault.java | 4 +-
.../specloader/SpecificationLoaderDefault.java | 14 +++----
.../specloader/facetprocessor/FacetProcessor.java | 12 +++---
.../specloader/specimpl/FacetedMethodsBuilder.java | 8 ++--
.../metamodel/specloader/specimpl/Factories.java | 2 +-
.../specimpl/ObjectActionContributee.java | 4 +-
.../specloader/specimpl/ObjectActionDefault.java | 10 ++---
.../specloader/specimpl/ObjectActionMixedIn.java | 6 +--
.../specimpl/ObjectActionParameterAbstract.java | 8 ++--
.../ObjectActionParameterContributeeAbstract.java | 3 +-
.../ObjectActionParameterMixedInAbstract.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 24 +++++------
.../specimpl/OneToManyAssociationContributee.java | 3 +-
.../specimpl/OneToManyAssociationDefault.java | 2 +-
.../specimpl/OneToManyAssociationMixedIn.java | 2 +-
.../specimpl/OneToOneAssociationContributee.java | 3 +-
.../specimpl/OneToOneAssociationDefault.java | 4 +-
.../specimpl/OneToOneAssociationMixedIn.java | 3 +-
.../isis/metamodel/specloader/specimpl/Utils.java | 4 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 10 ++---
.../CollectionFacetOnStandaloneList.java | 4 +-
.../ObjectSpecificationOnStandaloneList.java | 8 ++--
.../specloader/validator/ValidationFailures.java | 4 +-
.../isis/metamodel/util/DeweyOrderComparator.java | 2 +-
.../isis/metamodel/util/snapshot/XmlSnapshot.java | 4 +-
.../metamodel/MetaModelContext_forTesting.java | 6 +--
.../isis/metamodel/ServiceRegistry_forTesting.java | 18 ++++-----
.../metamodel/commons/ListUtilsTest_insert.java | 2 +-
.../Annotations_getAnnotations_on_Class_Test.java | 2 +-
.../Annotations_getAnnotations_on_Field_Test.java | 2 +-
.../Annotations_getAnnotations_on_Method_Test.java | 2 +-
...notations_getAnnotations_on_Parameter_Test.java | 2 +-
.../isis/metamodel/facets/CollectionUtilsTest.java | 2 +-
.../metamodel/facets/MethodFinderUtilsTest.java | 2 +-
.../org/apache/isis/metamodel/facets/Utils.java | 2 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 2 +-
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
...etForCollectionLayoutAnnotationFactoryTest.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../TitleFacetViaTitleAnnotationTest.java | 2 +-
.../NavigableParentAnnotationFacetFactoryTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 4 +-
.../memberorder/MemberOrderComparatorTest.java | 2 +-
...jectAssociationPredicatesTest_visibleWhere.java | 2 +-
.../interactions/InteractionUtils_isA_Test.java | 2 +-
...erviceInjectorDefaultTest_validateServices.java | 2 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
.../isis/metamodel/services/grid/BS3GridTest.java | 4 +-
.../services/menubars/BS3MenuBarsTest.java | 2 +-
.../metamodel/MetaModelServiceDefaultTest.java | 6 +--
...ionParameterAbstractTest_getId_and_getName.java | 4 +-
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 8 ++--
.../apache/isis/runtime/context/IsisContext.java | 2 +-
.../session/RuntimeEventSupport_Spring.java | 2 +-
.../persistence/adapter/ObjectAdapterForBean.java | 4 +-
.../runtime/persistence/adapter/PojoAdapter.java | 6 +--
.../persistence/session/PersistenceSession.java | 4 +-
.../events/PersistenceEventService_Spring.java | 2 +-
.../transaction/ChangedObjectsService.java | 4 +-
.../transaction/IsisTransactionAspectSupport.java | 4 +-
.../transaction/IsisTransactionFlushException.java | 2 +-
.../IsisTransactionManagerException.java | 2 +-
.../apache/isis/runtime/session/IsisSession.java | 2 +-
.../runtime/session/IsisSessionFactoryDefault.java | 10 ++---
.../session/init/InitialisationSession.java | 2 +-
.../runtimeservices/InitialisationException.java | 2 +-
.../isis/runtimeservices/ServiceException.java | 2 +-
.../background/BackgroundCommandExecution.java | 2 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 8 ++--
.../command/CommandExecutorServiceDefault.java | 4 +-
.../confmenu/ConfigurationViewServiceDefault.java | 8 ++--
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../isis/runtimeservices/error/EmailTicket.java | 2 +-
.../isis/runtimeservices/error/SimpleTicket.java | 4 +-
.../factory/FactoryServiceDefault.java | 4 +-
.../homepage/HomePageResolverServiceDefault.java | 8 ++--
.../apache/isis/runtimeservices/i18n/po/Block.java | 2 +-
.../isis/runtimeservices/i18n/po/PoReader.java | 10 ++---
.../isis/runtimeservices/i18n/po/PoWriter.java | 4 +-
.../i18n/po/TranslationServicePo.java | 6 +--
.../ixn/InteractionDtoServiceInternalDefault.java | 1 -
.../menubars/MenuBarsLoaderServiceDefault.java | 4 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 12 +++---
.../publish/PublishedObjectsDefault.java | 8 ++--
.../publish/PublisherDispatchServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 4 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../runtimeservices/wrapper/AsyncWrapDefault.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 6 +--
.../InteractionEventDispatcherTypeSafe.java | 2 +-
.../AbstractCollectionInvocationHandler.java | 2 +-
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 8 ++--
.../wrapper/proxy/ProxyCreator.java | 8 ++--
.../xactn/TransactionServiceSpring.java | 2 +-
.../xmlsnapshot/XmlSnapshotBuilder.java | 2 +-
.../email/EmailServiceDefaultTest_actually.java | 2 +-
.../isis/runtimeservices/i18n/po/PoReaderTest.java | 4 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../api/authentication/AuthenticationRequest.java | 2 +-
.../AuthenticationRequestAbstract.java | 4 +-
.../api/authentication/AuthenticationSession.java | 4 +-
.../AuthenticationSessionAbstract.java | 16 ++++----
.../security/api/authentication/MessageBroker.java | 2 +-
.../AuthenticationRequestLogonFixture.java | 2 +-
.../authentication/health/HealthAuthSession.java | 2 +-
.../manager/AuthenticationManager.java | 6 +--
.../singleuser/SingleUserSession.java | 6 +--
.../standard/NoAuthenticatorException.java | 2 +-
.../api/authentication/standard/SimpleSession.java | 4 +-
.../isis/security/EncodabilityContractTest.java | 8 ++--
.../SimpleSessionEncodabilityNoRolesTest.java | 2 +-
.../SimpleSessionEncodabilityWithRolesTest.java | 2 +-
.../AbstractApplyToAllContractTest.java | 2 +-
...irectionalRelationshipContractTestAbstract.java | 10 ++---
.../comparable/ComparableContractTester.java | 2 +-
.../unittestsupport/config/internal/_Config.java | 4 +-
.../config/internal/_Config_Instance.java | 8 ++--
.../config/internal/_Config_LifecycleResource.java | 4 +-
.../config/internal/_Config_Parsers.java | 4 +-
.../config/internal/_Config_trim.java | 2 +-
...rviceMethodMustBeFinalContractTestAbstract.java | 6 +--
.../isis/unittestsupport/jaxb/JaxbMatchers.java | 4 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../jmocking/JUnitRuleMockery2.java | 6 +--
.../unittestsupport/soap/PublishedEndpoints.java | 4 +-
.../soap/SoapEndpointPublishingRule.java | 2 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 6 +--
.../isis/unittestsupport/utils/ReflectUtils.java | 2 +-
.../isis/webapp/context/memento/ObjectMemento.java | 4 +-
.../context/memento/ObjectMementoCollection.java | 2 +-
.../org/apache/isis/webapp/modules/WebModule.java | 2 +-
.../isis/webapp/modules/WebModuleAbstract.java | 2 +-
.../isis/webapp/modules/WebModuleContext.java | 4 +-
.../logonlog/WebModuleLogOnExceptionLogger.java | 2 +-
.../TemplateResourceCachingFilter.java | 2 +-
.../templresources/TemplateResourceServlet.java | 8 ++--
...plateResourceServlet_HtmlTemplateVariables.java | 6 +--
.../templresources/WebModuleTemplateResources.java | 2 +-
.../webappctx/IsisWebAppContextInitializer.java | 2 +-
.../main/java/demoapp/dom/types/blob/BlobDemo.java | 4 +-
.../dom/types/primitive/PrimitivesDemo.java | 2 +-
.../demoapp/utils/LibraryPreloadingService.java | 4 +-
.../org/apache/isis/testdomain/jdo/BookDto.java | 4 +-
.../isis/testdomain/jdo/InventoryResource.java | 2 +-
.../bootstrapping/AutoConfigurationTest.java | 2 +-
.../SpringServiceProvisioningTest.java | 12 +++---
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
...nModelTest_usingBadDomain_noActionEnforced.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 4 +-
.../eventhandling/SpringEventPublishingTest.java | 2 +-
.../isis/testdomain/shiro/AbstractShiroTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
.../secman/api/SecurityModuleConfig.java | 2 +-
.../api/permission/ApplicationPermissionMode.java | 2 +-
.../api/permission/ApplicationPermissionRule.java | 2 +-
.../permission/ApplicationPermissionValueSet.java | 4 +-
.../PermissionsEvaluationServiceAbstract.java | 2 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 2 +-
.../app/feature/ApplicationFeatureViewModel.java | 4 +-
.../app/feature/ApplicationFeatureViewModels.java | 2 +-
.../user/ApplicationUser_filterPermissions.java | 2 +-
.../app/user/ApplicationUser_permissions.java | 2 +-
.../model/app/user/UserPermissionViewModel.java | 4 +-
.../facets/TenantedAuthorizationFacetFactory.java | 2 +-
.../ApplicationPermissionRepository.java | 10 ++---
.../secman/jdo/dom/role/ApplicationRole.java | 2 +-
.../jdo/dom/role/ApplicationRoleRepository.java | 2 +-
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 2 +-
.../dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../secman/jdo/dom/user/ApplicationUser.java | 6 +--
.../jdo/dom/user/ApplicationUserRepository.java | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 2 +-
.../scripts/AbstractUserAndRolesFixtureScript.java | 4 +-
.../IsisModuleSecurityAdminRoleAndPermissions.java | 2 +-
.../secman/shiro/AuthInfoForApplicationUser.java | 2 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
...lCollectionForApplicationUserOnSingleRealm.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 2 +-
.../shirorealmldap/realm/impl/IsisLdapRealm.java | 6 +--
.../cors/impl/webmodule/WebModuleCors.java | 2 +-
.../jee_support/IsisCDIBeanScanInterceptor.java | 4 +-
.../SupportingMethodValidatorRefinerFactory.java | 4 +-
.../isis/legacy/applib/DomainObjectContainer.java | 2 +-
.../internal/threadpool/ThreadPoolSupport.java | 10 ++---
.../internal/threadpool/ThreadPoolSupportTest.java | 2 +-
.../value/money/MoneyValueSemanticsProvider.java | 2 +-
.../isis/legacy/restclient/RestfulClient.java | 2 +-
.../isis/extensions/restclient/ResponseDigest.java | 6 +--
.../isis/extensions/restclient/RestfulClient.java | 6 +--
.../restclient/auth/BasicAuthFilter.java | 4 +-
.../restclient/log/RestfulLoggingFilter.java | 2 +-
.../applib/exceptions/NotPersistableException.java | 2 +-
.../exceptions/UnsupportedFindException.java | 2 +-
.../CreateSchemaObjectFromClassMetadata.java | 2 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 4 +-
.../queries/PersistenceQueryProcessorAbstract.java | 4 +-
.../persistence/spi/JdoObjectIdSerializer.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 4 +-
.../entities/JdoEntityTypeRegistry.java | 4 +-
.../exceprecog/JdoNestedExceptionResolver.java | 2 +-
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 6 +--
.../mixins/Persistable_downloadJdoMetadata.java | 2 +-
.../datanucleus5/metamodel/JdoMetamodelUtil.java | 4 +-
.../metamodel/JdoProgrammingModelPlugin.java | 10 ++---
.../JdoDiscriminatorAnnotationFacetFactory.java | 2 +-
...cIdFacetForJdoPersistenceCapableAnnotation.java | 2 +-
...doPersistenceCapableAnnotationFacetFactory.java | 2 +-
.../JdoPersistenceCapableFacetImpl.java | 6 +--
.../object/query/VisitorForClauseAbstract.java | 2 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../objectadapter/ObjectAdapterContext.java | 4 +-
.../ObjectAdapterContext_DependencyInjection.java | 2 +-
.../ObjectAdapterContext_Factories.java | 4 +-
...ObjectAdapterContext_LifecycleEventSupport.java | 2 +-
...ctAdapterContext_ObjectAdapterByIdProvider.java | 8 ++--
.../DataNucleusApplicationComponents5.java | 8 ++--
.../persistence/IsisLifecycleListener.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../persistence/IsisTransactionJdo.java | 5 +--
.../persistence/IsisTransactionManagerJdo.java | 2 +-
.../persistence/PersistenceSession5.java | 8 ++--
.../persistence/PersistenceSessionFactory5.java | 6 +--
.../persistence/query/PersistenceQueryFactory.java | 2 +-
.../transaction/PojoAdapterBuilder.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 2 +-
...actoryDefault_wrappedObject_transient_Test.java | 2 +-
.../keycloak/webmodule/WebModuleKeycloak.java | 2 +-
.../shiro/authentication/AuthenticatorShiro.java | 2 +-
.../shiro/authorization/IsisPermission.java | 4 +-
.../PermissionToRoleMapperFromString.java | 2 +-
.../isis/security/shiro/permrolemapper/Util.java | 4 +-
.../security/shiro/webmodule/WebModuleShiro.java | 6 +--
.../PermissionToRoleMapperFromIniTest.java | 2 +-
.../PermissionToRoleMapperFromStringTest.java | 2 +-
.../subdomains/excel/applib/dom/ExcelService.java | 2 +-
.../excel/applib/dom/util/ExcelServiceImpl.java | 2 +-
.../applib/services/FakeDataServiceTest.java | 4 +-
.../h2console/ui/webmodule/WebModuleH2Console.java | 6 +--
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 4 +-
.../integtestsupport/applib/ThrowableMatchers.java | 2 +-
.../applib/validate/ValidateDomainModel.java | 2 +-
.../integration/ObjectFactoryForIntegration.java | 2 +-
.../asciidoc/ui/components/AsciiDocComponent.java | 2 +-
.../markdown/ui/components/MarkdownComponent.java | 2 +-
.../metamodel/facets/SseObserveFacetAbstract.java | 2 +-
.../markup/ListeningMarkupComponent_observing.java | 4 +-
.../sse/ui/services/SseServiceDefault.java | 2 +-
.../sse/ui/webmodule/ServerSentEventsServlet.java | 6 +--
.../ui/webmodule/WebModuleServerSentEvents.java | 2 +-
.../restfulobjects/applib/JsonRepresentation.java | 4 +-
.../restfulobjects/applib/RestfulResponse.java | 2 +-
.../restfulobjects/applib/util/MediaTypes.java | 2 +-
.../viewer/restfulobjects/applib/util/Parser.java | 8 ++--
.../restfulobjects/applib/util/PathNode.java | 6 +--
.../applib/util/UrlEncodingUtils.java | 2 +-
.../viewer/restfulobjects/applib/JsonFixture.java | 2 +-
.../JsonRepresentationTest_asInputStream.java | 4 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../restfulobjects/rendering/LinkFollowSpecs.java | 2 +-
.../rendering/ReprRendererAbstract.java | 4 +-
.../rendering/domainobjects/JsonValueEncoder.java | 6 +--
.../domainobjects/JsonValueEncoder_Converters.java | 2 +-
.../rendering/domainobjects/MemberType.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../ObjectCollectionReprRenderer.java | 2 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 2 +-
.../AbstractTypeFeatureReprRenderer.java | 2 +-
.../domaintypes/DomainTypeReprRenderer.java | 2 +-
.../acceptheader/AcceptHeaderServiceForRest.java | 4 +-
.../conneg/ContentNegotiationServiceAbstract.java | 6 +--
.../service/swagger/SwaggerServiceMenu.java | 2 +-
.../swagger/internal/ClassExcluderAbstract.java | 2 +-
.../service/swagger/internal/Generation.java | 4 +-
.../rendering/service/swagger/internal/Util.java | 4 +-
.../internal/ValuePropertyFactoryDefault.java | 6 +--
.../swagger/internal/ValuePropertyPlugin.java | 2 +-
.../rendering/util/FollowSpecUtil.java | 2 +-
.../rendering/util/JsonWriterUtil.java | 2 +-
.../restfulobjects/rendering/util/MapUtils.java | 2 +-
.../viewer/restfulobjects/rendering/util/Util.java | 4 +-
.../viewer/context/ResourceContext.java | 5 +--
.../viewer/mappers/ExceptionMapperAbstract.java | 4 +-
.../viewer/mappers/entity/ExceptionDetail.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 8 ++--
.../resources/DomainServiceResourceServerside.java | 2 +-
.../resources/DomainTypeResourceServerside.java | 2 +-
.../viewer/resources/ImageResourceServerside.java | 4 +-
.../viewer/resources/ObjectActionArgHelper.java | 3 +-
.../viewer/resources/ResourceAbstract.java | 2 +-
.../viewer/resources/VersionReprRenderer.java | 2 +-
.../webmodule/IsisRestfulObjectsSessionFilter.java | 8 ++--
.../AuthenticationSessionStrategyBasicAuth.java | 4 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../context/ResourceContext_getArg_Test.java | 4 +-
.../viewer/wicket/model/links/LinkAndLabel.java | 2 +-
.../wicket/model/links/ListOfLinksModel.java | 2 +-
.../wicket/model/mementos/PageParameterNames.java | 2 +-
.../wicket/model/models/ActionArgumentModel.java | 1 -
.../viewer/wicket/model/models/ActionModel.java | 6 +--
.../wicket/model/models/ActionPromptProvider.java | 2 +-
.../wicket/model/models/BookmarkTreeNode.java | 4 +-
.../wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 14 +++----
.../viewer/wicket/model/models/EntityModel.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 8 ++--
.../model/models/ToggledMementosProvider.java | 2 +-
.../isis/viewer/wicket/model/models/Util.java | 2 +-
.../wicket/model/models/WicketComponentUtils.java | 2 +-
.../actionresponse/ActionResultResponseType.java | 2 +-
.../ui/app/registry/ComponentFactoryRegistrar.java | 2 +-
.../ui/components/about/JarManifestModel.java | 6 +--
.../entityactions/AdditionalLinksPanel.java | 2 +-
.../actionmenu/entityactions/LinkAndLabelUtil.java | 2 +-
.../actionmenu/serviceactions/CssMenuItem.java | 4 +-
.../serviceactions/ServiceActionUtil.java | 4 +-
.../serviceactions/ServiceActionsPanel.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../actionprompt/ActionPromptHeaderPanel.java | 2 +-
.../components/actions/ActionParametersForm.java | 3 +-
.../collection/AssociatedWithActionsHelper.java | 2 +-
.../ui/components/collection/CollectionPanel.java | 4 +-
.../selector/CollectionSelectorHelper.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 8 ++--
.../CollectionContentsSortableDataProvider.java | 4 +-
.../ajaxtable/IsisAjaxFallbackHeadersToolbar.java | 2 +-
.../ajaxtable/IsisAjaxNavigationToolbar.java | 2 +-
.../ajaxtable/IsisTotalRecordsToolbar.java | 2 +-
.../ajaxtable/PrototypingMessageProvider.java | 4 +-
.../columns/ObjectAdapterPropertyColumn.java | 2 +-
.../columns/ObjectAdapterToggleboxColumn.java | 2 +-
.../summary/CollectionContentsAsSummary.java | 2 +-
.../components/entity/fieldset/PropertyGroup.java | 6 +--
.../selector/links/EntityLinksSelectorPanel.java | 2 +-
.../wicket/ui/components/footer/FooterPanel.java | 4 +-
.../wicket/ui/components/layout/bs3/Util.java | 2 +-
.../wicket/ui/components/layout/bs3/col/Col.java | 4 +-
.../components/layout/bs3/tabs/TabGroupPanel.java | 2 +-
.../components/scalars/IsisConverterLocator.java | 4 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 +--
.../scalars/ScalarPanelSelect2Abstract.java | 1 -
.../scalars/ScalarPanelTextFieldAbstract.java | 2 +-
.../scalars/reference/ReferencePanel.java | 3 +-
.../ui/components/scalars/uuid/UuidConverter.java | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 5 +--
.../components/tree/IsisToWicketTreeAdapter.java | 6 +--
.../widgets/breadcrumbs/BreadcrumbModel.java | 4 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../widgets/buttons/ContainedButtonPanel.java | 2 +-
.../select2/Select2BootstrapCssReference.java | 2 +-
.../widgets/select2/Select2JsReference.java | 2 +-
.../ObjectAdapterMementoProviderAbstract.java | 4 +-
...entoProviderForReferenceObjectAutoComplete.java | 2 +-
...derForReferenceParamOrPropertyAutoComplete.java | 4 +-
...bjectAdapterMementoProviderForValueChoices.java | 2 +-
.../themepicker/IsisWicketThemeSupport.java | 2 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 6 +--
.../themepicker/ThemeProviderComposite.java | 6 +--
.../viewer/wicket/ui/errors/ExceptionModel.java | 6 +--
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../viewer/wicket/ui/pages/error/ErrorPage.java | 2 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 2 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 +-
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 2 +-
.../wicket/ui/panels/PromptFormAbstract.java | 2 +-
.../isis/viewer/wicket/ui/util/Components.java | 2 +-
.../viewer/wicket/ui/util/CssClassAppender.java | 2 +-
.../viewer/wicket/ui/util/CssClassRemover.java | 2 +-
.../isis/viewer/wicket/ui/util/CssIdAppender.java | 2 +-
.../isis/viewer/wicket/ui/util/Tooltips.java | 2 +-
...tAdapterMementoProviderForValueChoicesTest.java | 2 +-
.../ConverterForObjectAdapterMemento.java | 2 +-
.../viewer/integration/LocalizerForIsis.java | 2 +-
.../viewer/integration/WebRequestCycleForIsis.java | 4 +-
.../ComponentFactoryRegistrarDefault.java | 3 +-
.../ComponentFactoryRegistryDefault.java | 6 +--
.../registries/pages/PageClassRegistryDefault.java | 2 +-
.../services/HintStoreUsingWicketSession.java | 2 +-
.../services/ImageResourceCacheClassPath.java | 4 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../viewer/services/mementos/CollectionData.java | 2 +-
.../viewer/services/mementos/ObjectMarshaller.java | 8 ++--
.../services/mementos/ObjectMementoLegacy.java | 8 ++--
.../mementos/ObjectMementoServiceWicket.java | 4 +-
.../services/mementos/ObjectUnmarshaller.java | 8 ++--
.../wicket/viewer/webmodule/WebModuleWicket.java | 4 +-
.../viewer/wicketapp/IsisWicketApplication.java | 8 ++--
.../IsisWicketApplication_Experimental.java | 2 +-
.../IsisWicketApplication_newPageFactory.java | 2 +-
899 files changed, 1684 insertions(+), 1874 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
index 417c838..7a7a2d6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
public class Identifier implements Comparable<Identifier> {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
index 2db604b..a5ef8d0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib;
import org.apache.isis.applib.services.exceprecog.TranslatableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.functions._Functions;
/**
* Indicates that an unexpected, non-recoverable (fatal) exception has occurred within
diff --git a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
index 95df889..a52e2f5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib;
import org.apache.isis.applib.services.exceprecog.TranslatableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
* Indicates that an exceptional condition/problem has occurred within the application's domain logic.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java b/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
index 9eb6659..dd0ff85 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
@@ -21,9 +21,9 @@ package org.apache.isis.applib.client;
import java.util.EnumSet;
import java.util.List;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
/**
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
index 4d4ac5f..f72000b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
@@ -21,15 +21,13 @@ package org.apache.isis.applib.events.domain;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java b/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
index 6668e33..06a9edb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
@@ -20,9 +20,9 @@ package org.apache.isis.applib.events.domain;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* @since 2.0
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
index d52e577..cd8341f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.menubars.MenuBars;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.isis.applib.annotation.DomainServiceLayout}.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
index 81eb614..e46d79c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
index 2f33de8..2e7b5d1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib.query;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
index c831be8..78267b8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.appfeat;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
public enum ApplicationMemberType {
PROPERTY,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
index c685ba0..ec03bb3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.Objects;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index da05d27..cdb0bda 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -20,10 +20,10 @@ package org.apache.isis.applib.services.bookmark;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
index 631c0ec..de0e952 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
@XmlRootElement(name = "configurationProperty")
@XmlType(
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
index 9d26dfc..5a6a016 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
public interface ContentMappingService {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 53048b3..1a2c5dc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -29,8 +29,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
index 4e0e7ed..d8ef200 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Convenience implementation of {@link ExceptionRecognizer} that loops through a list of
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
index 7ace8f5..0cb2674 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
@@ -23,10 +23,10 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.getCausalChain;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.getCausalChain;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index 28b2d9e..8f8f1f9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
@Value
public final class TranslatableString {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index d53e822..378c702 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -38,8 +38,8 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.InteractionType;
import org.apache.isis.schema.common.v1.PeriodDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
index 09a7375..820314c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
@@ -41,8 +41,8 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* An implementation of {@link SchemaOutputResolver} that keeps track of all the schemas for which it has
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index a6a98a3..c2d626b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -36,9 +36,9 @@ import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
public interface JaxbService {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index 7f973e8..9d2cf55 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
@Named("isisApplib.LayoutServiceMenu")
@DomainService(objectType = "isisApplib.LayoutServiceMenu")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index b1e5778..01b9723 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties.S
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index 8b103c8..77a0ad5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -42,9 +42,9 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
@Named("isisApplib.MetaModelServicesMenu")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
index 61908de..869e486 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
@@ -32,9 +32,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.WithTransactionScope;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index 43ed4a4..bdadaaf 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -27,12 +27,12 @@ import java.util.stream.Stream;
import javax.annotation.Priority;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Reduction;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Reduction;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 7e33a95..79f817b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -29,7 +29,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
index 8f2749d..19be5e2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.memento._Mementos.EncoderDecoder;
public interface UrlEncodingService extends EncoderDecoder {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
index 8bc0dd2..bedd2b1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
@@ -20,8 +20,8 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* to use, subclass and annotated with:
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
index b7f753b..21b5d53 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
@@ -28,8 +28,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
@Service
@Named("isisApplib.UrlEncodingServiceWithCompression")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index 110e6fc..7bd193f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
/**
* Adapter to make it easy to write {@link Specification}s.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
index f34b28f..34001ce 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder;
import java.util.stream.Stream;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
@Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
index 760bde1..927ad3b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
@@ -28,7 +28,7 @@ import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
public interface TreeNode<T> {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java b/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
index 2e5f185..d2d3129 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.util;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
public final class Enums {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java b/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
index a8509fd..c4610ca 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object Equality Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java b/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
index 1a393a4..5754570 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object Hash Code Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
index b0f2f10..67a142e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
@@ -30,8 +30,8 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* Provides JAXB XmlAdapters for Java built-in temporal types.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
index db7b1a3..ae8f8a1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
@@ -30,9 +30,9 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.resources._Resources;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
index 9120f11..e8d9aab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* Package private parser for ObjectContract.<br/><br/>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
index 2be0ad6..0a209c0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
@@ -22,8 +22,8 @@ import java.util.Comparator;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
index c10f0ba..b3cd010 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Extension to applib's {@link ReasonBuffer}.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
index 1219e34..edd02cc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.util;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
/**
* Title buffer is a utility class to help produce titles for objects without
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java b/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
index 129c52d..a11a431 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object to String Composition.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java b/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
index d60adc5..bea7b06 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
@@ -24,7 +24,7 @@ import java.io.OutputStreamWriter;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
index 7412d5f..78043f8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
@@ -32,7 +32,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.chg.v1.ChangesDto;
public final class ChangesDtoUtils {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
index 07373ba..820a995 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
@@ -31,7 +31,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MapDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index 4bb592d..c80b435 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -36,11 +36,11 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.cmd.v1.MapDto;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.common.v1.BlobDto;
@@ -57,7 +57,7 @@ import org.apache.isis.schema.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendar
import org.apache.isis.schema.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
import org.apache.isis.schema.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
-import static org.apache.isis.commons.internal.collections._Maps.entry;
+import static org.apache.isis.core.commons.internal.collections._Maps.entry;
public final class CommonDtoUtils {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
index 75d5ffa..a6fc9e2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.cmd.v1.ParamsDto;
import org.apache.isis.schema.common.v1.InteractionType;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
index 7b4d236..999af94 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java b/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
index 2930be7..1c031c2 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.value;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import static org.apache.isis.commons.internal.base._Strings.asFileNameWithExtension;
+import static org.apache.isis.core.commons.internal.base._Strings.asFileNameWithExtension;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
index bc8c6df..b6fa72a 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
@@ -33,10 +33,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
public class MementosTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
index 01ba575..2b301da 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
public class XmlSnapshotServiceAbstractTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index ba2d6cf..61363dc 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.junit.Before;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 842f53d..359f01c 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -30,8 +30,8 @@
<properties>
<objenesis.version>2.6</objenesis.version>
- <jar-plugin.automaticModuleName>org.apache.isis.codegen.bytebuddy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/codegen/bytebuddy</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.codegen.bytebuddy</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/codegen/bytebuddy</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
index 14a624d..7e81aa1 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
@@ -4,7 +4,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCommons;
@Configuration
@Import({
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
index 15b7fff..2dae439 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
@@ -28,12 +28,12 @@ import org.objenesis.Objenesis;
import org.objenesis.ObjenesisStd;
import org.springframework.stereotype.Service;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.NamingStrategy;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
deleted file mode 100644
index 7808f44..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
deleted file mode 100644
index affb458..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.functions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
deleted file mode 100644
index 27f2189..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.memento;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
deleted file mode 100644
index e84ac61..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.reflection;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
deleted file mode 100644
index 50399b9..0000000
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * <h1>Internal API</h1>
- * Internal classes, contributing to the internal proprietary API.
- * These may be changed or removed without notice!
- * <p>
- * <b>WARNING</b>:
- * Do NOT use any of the classes provided by this package!
- * </p>
- */
-package org.apache.isis.commons.internal.resources;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
similarity index 66%
rename from core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
index 36c8725..b6f8268 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCommons.java
@@ -1,9 +1,9 @@
-package org.apache.isis.commons;
+package org.apache.isis.core.commons;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
@Configuration
@Import({
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
index 6c8bf51..bc615d0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,9 +34,9 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.enterprise.inject.Instance;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
index 73aea09..acb595b 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
import java.lang.reflect.Array;
import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
index 783a759..d120f09 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -29,7 +29,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
index 4248bde..0962676 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
import java.lang.reflect.Array;
import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
index 5371493..c5c5b35 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.collections;
+package org.apache.isis.core.commons.collections;
/**
* @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java b/core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
index 56b1455..15783c6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.concurrent;
+package org.apache.isis.core.commons.concurrent;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.RequiredArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
index 23b0e93..034124e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
import java.io.PrintWriter;
@@ -28,7 +28,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
/**
* <p>Provides utilities for manipulating and examining
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
index 618c122..7e5b3c2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
/**
* Indicates an error raised by the application code.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
index 819d567..bb0e1a5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
import java.text.MessageFormat;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
index 537bf42..e33bd59 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
/**
* Indicates that a call was made to a method (normally an overridden one) that
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
index dc448d6..f26852e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.core.commons.exceptions;
public class UnknownTypeException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
index de038f6..80dca93 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
@@ -18,8 +18,8 @@
*/
/**
- * Defines {@link org.apache.isis.commons.exceptions.IsisException base class}
+ * Defines {@link org.apache.isis.core.commons.exceptions.IsisException base class}
* for exceptions raised either by Isis itself or by the domain model
* running on top of Isis.
*/
-package org.apache.isis.commons.exceptions;
\ No newline at end of file
+package org.apache.isis.core.commons.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java b/core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
index 120f9c0..28acb43 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.handler;
+package org.apache.isis.core.commons.handler;
import java.util.List;
import java.util.Optional;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
index 53e4f33..041749f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal;
+package org.apache.isis.core.commons.internal;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
index 3b17ed9..8e31070 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.commons.internal.assertions;
+package org.apache.isis.core.commons.internal.assertions;
import java.util.Objects;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
public final class _Assert {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
index 73dd263..a195929 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.lang.ref.WeakReference;
import java.util.Random;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
index 89005fc..de3b7ae 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,8 +27,8 @@ import java.util.function.UnaryOperator;
import javax.annotation.Nullable;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
index 59575dc..10b16dd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
index 683f666..13de96e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
index cd433c1..66825b2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Optional;
import java.util.function.BiFunction;
import javax.annotation.Nullable;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
index 0fb04a4..2715b95 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Optional;
import java.util.function.BiFunction;
@@ -26,7 +26,7 @@ import java.util.function.Function;
import javax.annotation.Nullable;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
index f29d690..526d739 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.function.Supplier;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
index a2c492d..8010bcc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.function.Supplier;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* package private mixin for _Lazy
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
similarity index 93%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
index 7ec7ed7..f1de3c2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.function.Supplier;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* package private mixin for _Lazy
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
index fda8be2..39f9677 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Collection;
import java.util.Comparator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
index 8cb2674..ab8fc6e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Optional;
import java.util.function.BinaryOperator;
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
index ba83deb..8b65414 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.io.BufferedReader;
import java.io.IOException;
@@ -42,15 +42,15 @@ import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Bytes.BytesOperator;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Bytes.BytesOperator;
-import static org.apache.isis.commons.internal.base._NullSafe.size;
-import static org.apache.isis.commons.internal.base._Strings_SplitIterator.splitIterator;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.base._NullSafe.size;
+import static org.apache.isis.core.commons.internal.base._Strings_SplitIterator.splitIterator;
+import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
index 7e6a529..a1cd524 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
index 0fc181f..ea2d8d3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
@@ -17,9 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
-
-import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
+package org.apache.isis.core.commons.internal.base;
/**
*
@@ -46,7 +44,7 @@ final class _Strings_HtmlEscaper {
String output = input;
- for(KeyValuePair replacement : replacements) {
+ for(_Strings.KeyValuePair replacement : replacements) {
output = output.replace(replacement.getKey(), replacement.getValue());
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
index 5a1bb07..6abe6a6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
@@ -17,13 +17,11 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Optional;
-import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
-
-import static org.apache.isis.commons.internal.exceptions._Exceptions.notImplemented;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.notImplemented;
/**
*
@@ -32,7 +30,7 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.notImpleme
*/
final class _Strings_KeyValuePair implements _Strings.KeyValuePair {
- static KeyValuePair of(String key, String value) {
+ static _Strings.KeyValuePair of(String key, String value) {
return new _Strings_KeyValuePair(key, value);
}
@@ -64,7 +62,7 @@ final class _Strings_KeyValuePair implements _Strings.KeyValuePair {
*
* @return a non-empty Optional, if (and only if) the {@code keyValueLiteral} does contain at least one '='
*/
- public static Optional<KeyValuePair> parse(String keyValueLiteral) {
+ public static Optional<_Strings.KeyValuePair> parse(String keyValueLiteral) {
if(_Strings.isNullOrEmpty(keyValueLiteral)) {
return Optional.empty();
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
index 0f1dd27..420a882 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import javax.annotation.Nullable;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
index 4613043..7d03ba8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Collections;
import java.util.Iterator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
index 7fa9a15..1de50af 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Locale;
import java.util.function.Supplier;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
index 6668abb..daedf41 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import lombok.Value;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
index 2607220..6147b8e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
similarity index 95%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
index c37920f..d4620a0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.base;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
index a248237..88d718a 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.lang.reflect.Array;
import java.util.Arrays;
@@ -29,11 +29,10 @@ import java.util.stream.Collector;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.NonNull;
import lombok.val;
@@ -80,7 +79,7 @@ public final class _Arrays {
if(s1==0) {
return false;
}
- requires(test, "test");
+ _With.requires(test, "test");
for(int i=0; i<s1; ++i) {
if(test.test(array1[i], array2[i])) {
@@ -106,7 +105,7 @@ public final class _Arrays {
@Nullable final T[] array1,
@Nullable final T[] array2,
final BiPredicate<T, T> test) {
- requires(test, "test");
+ _With.requires(test, "test");
return !testAnyMatch(array1, array2, test.negate());
}
@@ -138,7 +137,7 @@ public final class _Arrays {
* @return
*/
public static <T> Collector<T,?,T[]> toArray(final Class<T> componentType, final int length){
- requires(componentType, "componentType");
+ _With.requires(componentType, "componentType");
return new _Arrays_Collector<T>(componentType, length);
}
@@ -148,7 +147,7 @@ public final class _Arrays {
* @return
*/
public static <T> Collector<T,?,T[]> toArray(final Class<T> componentType){
- requires(componentType, "componentType");
+ _With.requires(componentType, "componentType");
return new _Arrays_CollectorUnknownSize<T>(componentType);
}
@@ -162,7 +161,7 @@ public final class _Arrays {
*/
@SafeVarargs
public static <T> T[] combine(T first, @Nullable T... rest) {
- requires(first, "first");
+ _With.requires(first, "first");
final int restLength = _NullSafe.size(rest);
final T[] all = _Casts.uncheckedCast(Array.newInstance(first.getClass(), restLength+1));
all[0] = first;
@@ -181,8 +180,8 @@ public final class _Arrays {
*/
@SafeVarargs
public static <T, X extends T, Y extends T> T[] combine(Class<T> type, X first, @Nullable Y... rest) {
- requires(type, "type");
- requires(first, "first");
+ _With.requires(type, "type");
+ _With.requires(first, "first");
final int restLength = _NullSafe.size(rest);
final T[] all = _Casts.uncheckedCast(Array.newInstance(type, restLength+1));
all[0] = first;
@@ -223,7 +222,7 @@ public final class _Arrays {
* have been copied (non-null)
*/
public static <T> T[] toArray(@Nullable final Collection<? extends T> collection, final Class<T> componentType) {
- requires(componentType, "componentType");
+ _With.requires(componentType, "componentType");
return _NullSafe.stream(collection)
.collect(toArray(componentType, collection!=null ? collection.size() : 0));
}
@@ -237,7 +236,7 @@ public final class _Arrays {
* have been copied (non-null)
*/
public static <T> T[] toArray(@Nullable final Iterable<? extends T> iterable, final Class<T> componentType) {
- requires(componentType, "componentType");
+ _With.requires(componentType, "componentType");
if(iterable!=null && (iterable instanceof Collection)) {
return toArray((Collection<? extends T>) iterable, componentType);
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
index 00ab2d1..2a1f874 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.lang.reflect.Array;
import java.util.Collections;
@@ -28,7 +28,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
index b81b64b..696a399 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -30,7 +30,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
index 2566eb7..6ae98e0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
@@ -39,9 +39,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
/**
* <h1>- internal use only -</h1>
@@ -204,7 +203,7 @@ public final class _Collections {
*/
public static <T> Collector<T, ?, ? extends Collection<T>> toUnmodifiableOfType(Class<?> typeOfCollection) {
- requires(typeOfCollection, "typeOfCollection");
+ _With.requires(typeOfCollection, "typeOfCollection");
if(SortedSet.class.equals(typeOfCollection)) {
return toUnmodifiableSortedSet();
@@ -311,7 +310,7 @@ public final class _Collections {
// -- TO STRING
public static String toStringJoining(@Nullable Collection<?> collection, String delimiter) {
- requires(delimiter, "delimiter");
+ _With.requires(delimiter, "delimiter");
return _NullSafe.stream(collection)
.map(x->""+x)
.collect(Collectors.joining(delimiter));
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
index b0d0e4d..01fbdb5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.Collection;
import java.util.Collections;
@@ -28,7 +28,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
/**
*
@@ -43,8 +43,8 @@ class _Collections_Collector<T, C extends Collection<T>> implements Collector<T,
private final Function<C, C> finisher;
_Collections_Collector(Supplier<C> supplier, Function<C, C> finisher) {
- this.supplier = requires(supplier, "supplier");
- this.finisher = requires(finisher, "finisher");
+ this.supplier = _With.requires(supplier, "supplier");
+ this.finisher = _With.requires(finisher, "finisher");
}
@Override
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
index 9aaa6ed..409cad0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.Collection;
import java.util.Comparator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
index 243475a..b3b3d8e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
index 47dac6b..6c20958 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,9 +34,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._NullSafe;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
/**
* <h1>- internal use only -</h1>
@@ -71,7 +70,7 @@ public final class _Lists {
* @return non null
*/
public static <T> List<T> singleton(T element) {
- requires(element, "element"); // don't accept null element
+ _With.requires(element, "element"); // don't accept null element
return Collections.singletonList(element);
}
@@ -92,7 +91,7 @@ public final class _Lists {
*/
@SafeVarargs
public static <T> List<T> of(T ... elements) {
- requires(elements, "elements"); // don't accept null as argument
+ _With.requires(elements, "elements"); // don't accept null as argument
if(elements.length==0) {
return Collections.emptyList();
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
index c4b6cc9..8e31ef7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.AbstractMap;
import java.util.Collection;
@@ -35,12 +35,11 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.NonNull;
import lombok.Value;
@@ -126,7 +125,7 @@ public final class _Maps {
@SafeVarargs
public static <K, V> Map<K, V> unmodifiableEntries(Map.Entry<? extends K,? extends V>... entries) {
- requires(entries, "entries"); // don't accept null elements
+ _With.requires(entries, "entries"); // don't accept null elements
if(entries.length==0) {
return Collections.emptyMap();
}
@@ -172,14 +171,14 @@ public final class _Maps {
Predicate<K> keyFilter,
Supplier<Map<K, V>> factory) {
- requires(factory, "factory");
+ _With.requires(factory, "factory");
final Map<K, V> result = factory.get();
if(input==null) {
return result;
}
- requires(keyFilter, "keyFilter");
+ _With.requires(keyFilter, "keyFilter");
input.forEach((k, v)->{
if(keyFilter.test(k)) {
@@ -238,7 +237,7 @@ public final class _Maps {
public static <K, V> AliasMap<K, V> newAliasMap(
final Supplier<Map<K, V>> mapFactory){
- requires(mapFactory, "mapFactory");
+ _With.requires(mapFactory, "mapFactory");
return new AliasMap<K, V>() {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
index d0a20c4..0457f68 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.ArrayList;
import java.util.Collection;
@@ -39,9 +39,8 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Casts;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.val;
@@ -196,8 +195,8 @@ public class _Multimaps {
final Supplier<Map<K, List<V>>> mapFactory,
final Supplier<List<V>> elementCollectionFactory){
- requires(mapFactory, "mapFactory");
- requires(elementCollectionFactory, "elementCollectionFactory");
+ _With.requires(mapFactory, "mapFactory");
+ _With.requires(elementCollectionFactory, "elementCollectionFactory");
return new ListMultimap<K, V>() {
@@ -234,8 +233,8 @@ public class _Multimaps {
final Supplier<? extends Map<K, S>> mapFactory,
final Supplier<S> elementCollectionFactory){
- requires(mapFactory, "mapFactory");
- requires(elementCollectionFactory, "elementCollectionFactory");
+ _With.requires(mapFactory, "mapFactory");
+ _With.requires(elementCollectionFactory, "elementCollectionFactory");
return new SetMultimap<K, V>() {
@@ -272,8 +271,8 @@ public class _Multimaps {
final Supplier<Map<K1, Map<K2, V>>> mapFactory,
final Supplier<Map<K2, V>> elementMapFactory){
- requires(mapFactory, "mapFactory");
- requires(elementMapFactory, "elementMapFactory");
+ _With.requires(mapFactory, "mapFactory");
+ _With.requires(elementMapFactory, "elementMapFactory");
return new MapMultimap<K1, K2, V>() {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
index 172c25b..09a086f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.Collection;
import java.util.Collections;
@@ -38,10 +38,10 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
/**
* <h1>- internal use only -</h1>
@@ -67,7 +67,7 @@ public final class _Sets {
* @return non null
*/
public static <T> Set<T> singleton(T element) {
- requires(element, "element"); // don't accept null element
+ _With.requires(element, "element"); // don't accept null element
return Collections.singleton(element);
}
@@ -88,7 +88,7 @@ public final class _Sets {
*/
@SafeVarargs
public static <T> Set<T> of(T ... elements) {
- requires(elements, "elements");// don't accept null as argument
+ _With.requires(elements, "elements");// don't accept null as argument
if(elements.length==0) {
return Collections.emptySet();
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
index 1bd8317..9ce49a4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.stream.Stream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
index c37920f..6e97271 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.collections;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
index becad61..fe3c064 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.collections.snapshot;
+package org.apache.isis.core.commons.internal.collections.snapshot;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +26,7 @@ import java.util.UUID;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -97,7 +97,7 @@ public final class _VersionedList<T> {
public Snapshot<T> deltaSince(Snapshot<T> snapshot) {
- requires(snapshot, "snapshot");
+ _With.requires(snapshot, "snapshot");
if(snapshot.ownerUuid!=uuid) {
throw new IllegalArgumentException("Snapshot's UUID is different from the VersionedList's.");
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
index fad7be8..3086c91 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
import java.util.Comparator;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
index a00a19d..10485d8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
import java.util.StringTokenizer;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
index bcc7049..109a805 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.collections;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.compare;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
index b74b775..5173968 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ForkJoinPool;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
index dfa7dba..7a3dafb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
import java.util.concurrent.Callable;
import java.util.function.Supplier;
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.Getter;
import lombok.val;
@@ -101,7 +101,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
public _ConcurrentTask<T> withName(String name) {
- requires(name, "name");
+ _With.requires(name, "name");
val delegate = this;
@@ -123,7 +123,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
public _ConcurrentTask<T> withName(Supplier<String> nameSupplier) {
- requires(nameSupplier, "nameSupplier");
+ _With.requires(nameSupplier, "nameSupplier");
val delegate = this;
@@ -148,7 +148,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
public static _ConcurrentTask<Void> of(Runnable runnable) {
- requires(runnable, "runnable");
+ _With.requires(runnable, "runnable");
return new _ConcurrentTask<Void>() {
@@ -168,7 +168,7 @@ public abstract class _ConcurrentTask<T> implements Runnable {
public static <X> _ConcurrentTask<X> of(Callable<X> callable) {
- requires(callable, "callable");
+ _With.requires(callable, "callable");
return new _ConcurrentTask<X>() {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
index bc6295f..54a0429 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
@@ -32,8 +32,8 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.logging.log4j.Level;
-import org.apache.isis.commons.concurrent.AwaitableLatch;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.concurrent.AwaitableLatch;
+import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
index 5d1485f..82af6d7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
import java.util.List;
import java.util.Map;
@@ -26,14 +26,13 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseThrow;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
/**
* <h1>- internal use only -</h1>
@@ -71,8 +70,8 @@ public final class _Context {
* on the current context.
*/
public static <T> void putSingleton(Class<? super T> type, T singleton) {
- requires(type, "type");
- requires(singleton, "singleton");
+ _With.requires(type, "type");
+ _With.requires(singleton, "singleton");
// let writes to the map be atomic
synchronized ($LOCK) {
@@ -92,8 +91,8 @@ public final class _Context {
* @return whether the {@code singleton} was put on the context or ignored because there is already one present
*/
public static <T> boolean put(Class<? super T> type, T singleton, boolean override) {
- requires(type, "type");
- requires(singleton, "singleton");
+ _With.requires(type, "type");
+ _With.requires(singleton, "singleton");
// let writes to the map be atomic
synchronized ($LOCK) {
@@ -124,8 +123,8 @@ public final class _Context {
* @return null, if there is no such instance
*/
public static <T> T computeIfAbsent(Class<? super T> type, Function<Class<? super T>, T> factory) {
- requires(type, "type");
- requires(factory, "factory");
+ _With.requires(type, "type");
+ _With.requires(factory, "factory");
final T existingIfAny = _Casts.uncheckedCast(singletonMap.get(type));
if(existingIfAny!=null) {
@@ -167,8 +166,8 @@ public final class _Context {
* @return null, if there is no such instance
*/
public static <T> T computeIfAbsent(Class<? super T> type, Supplier<T> factory) {
- requires(type, "type");
- requires(factory, "factory");
+ _With.requires(type, "type");
+ _With.requires(factory, "factory");
return computeIfAbsent(type, __->factory.get());
}
@@ -183,8 +182,8 @@ public final class _Context {
* @return
*/
public static <T> T getOrElse(Class<? super T> type, Supplier<T> fallback) {
- requires(fallback, "fallback");
- return ifPresentElseGet(getIfAny(type), fallback);
+ _With.requires(fallback, "fallback");
+ return _With.ifPresentElseGet(getIfAny(type), fallback);
}
/**
@@ -200,9 +199,9 @@ public final class _Context {
Supplier<E> onNotFound)
throws E {
- requires(type, "type");
- requires(onNotFound, "onNotFound");
- return ifPresentElseThrow(getIfAny(type), onNotFound);
+ _With.requires(type, "type");
+ _With.requires(onNotFound, "onNotFound");
+ return _With.ifPresentElseThrow(getIfAny(type), onNotFound);
}
/**
@@ -212,7 +211,7 @@ public final class _Context {
* @return
*/
public static <T> T getElseFail(Class<? super T> type) {
- return ifPresentElseThrow(getIfAny(type), ()->
+ return _With.ifPresentElseThrow(getIfAny(type), ()->
new NoSuchElementException(String.format("Could not resolve an instance of type '%s'", type.getName())));
}
@@ -246,7 +245,7 @@ public final class _Context {
}
private static void closeAnyClosables(List<Object> objects) {
- stream(objects)
+ _NullSafe.stream(objects)
.forEach(_Context::tryClose);
}
@@ -323,7 +322,7 @@ public final class _Context {
if(!alreadyRegistered || override) {
// let writes to the map be atomic
synchronized ($LOCK) {
- singletonMap.put(ClassLoader.class, requires(classLoader, "classLoader"));
+ singletonMap.put(ClassLoader.class, _With.requires(classLoader, "classLoader"));
}
}
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
index 1b81572..a42b783 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
@@ -17,16 +17,15 @@
* under the License.
*/
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
import java.util.Map;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Multimaps;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Multimaps;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.Value;
import lombok.val;
@@ -59,8 +58,8 @@ final class _Context_ThreadLocal {
}
static <T> Runnable put(Class<? super T> type, T variant) {
- requires(type, "type");
- requires(variant, "variant");
+ _With.requires(type, "type");
+ _With.requires(variant, "variant");
val threadLocalMap = getOrCreateThreadLocalMap();
threadLocalMap
@@ -129,7 +128,7 @@ final class _Context_ThreadLocal {
InheritableThreadLocal.withInitial(()->ThreadKey.of(Thread.currentThread()));
- private final static _Multimaps.MapMultimap<ThreadKey, Class<?>, Can<?>> MAPS_BY_KEY =
+ private final static _Multimaps.MapMultimap<ThreadKey, Class<?>, Can<?>> MAPS_BY_KEY =
_Multimaps.newConcurrentMapMultimap();
private static Map<Class<?>, Can<?>> getThreadLocalMap() {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
similarity index 93%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
index f2a71be..9771bb8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
import java.io.File;
import java.net.URL;
@@ -31,12 +31,11 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.plugins.PluginResolveException;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.plugins.PluginResolveException;
+import org.apache.isis.core.commons.internal.base._With;
/**
* <h1>- internal use only -</h1>
@@ -70,7 +69,7 @@ public final class _Plugin {
* @return non null
*/
public static <S> Set<S> loadAll(Class<S> service){
- requires(service, "service");
+ _With.requires(service, "service");
ServiceLoader<S> loader = ServiceLoader.load(service, _Context.getDefaultClassLoader());
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
index 4153ce4..acfbfa4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.base;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.context;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
index 3bd851b..df0eb69 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.isis.commons.internal.debug;
+package org.apache.isis.core.commons.internal.debug;
import java.io.PrintStream;
import java.util.Map;
import java.util.concurrent.atomic.LongAdder;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.base._With;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._With;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
index e83ac17..dcfbe95 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.debug;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.debug;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
index e75ed20..f160d20 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataInput;
import java.io.DataInputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
index dde2bb0..94d97d9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
index 37ada9a..1ab6fa1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
index 7b7cc74..b525809 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataOutput;
import java.io.DataOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
index d7e9777..d2c3665 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
index bd6469f..af80371 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
index 8dc9e48..b8fc9b5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
import java.util.Arrays;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
index ef9e913..179f3c4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
index 6ffeaed..821b03d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
index 6c0dec0..6950c4d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
public class EncodingConstants {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
index 01e091e..edaa399 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
index aa549f1..6555be3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
index 75322c3..ec152e2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
import lombok.extern.log4j.Log4j2;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
index f65bc85..5fe342c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.environment;
+package org.apache.isis.core.commons.internal.environment;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
index 611a473..001b18e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.environment;
+package org.apache.isis.core.commons.internal.environment;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -34,9 +34,9 @@ import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.spring.IocContainerSpring;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.spring.IocContainerSpring;
import lombok.Getter;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
index 46ea01a..f8ff8e5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.exceptions;
+package org.apache.isis.core.commons.internal.exceptions;
import java.io.PrintStream;
import java.util.Collections;
@@ -31,13 +31,13 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.base._With;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
@@ -76,14 +76,14 @@ public final class _Exceptions {
public static final IllegalArgumentException illegalArgument(
final String format,
final @Nullable Object ... args) {
- requires(format, "format");
+ _With.requires(format, "format");
return new IllegalArgumentException(String.format(format, args));
}
public static IllegalStateException illegalState(
final String format,
final @Nullable Object ... args) {
- requires(format, "format");
+ _With.requires(format, "format");
return new IllegalStateException(String.format(format, args));
}
@@ -92,7 +92,7 @@ public final class _Exceptions {
}
public static final NoSuchElementException noSuchElement(String format, Object ...args) {
- requires(format, "format");
+ _With.requires(format, "format");
return noSuchElement(String.format(format, args));
}
@@ -208,7 +208,7 @@ public final class _Exceptions {
if(ex==null) {
return Stream.empty();
}
- return stream(ex.getStackTrace())
+ return _NullSafe.stream(ex.getStackTrace())
.map(StackTraceElement::toString)
.limit(maxLines);
}
@@ -220,7 +220,7 @@ public final class _Exceptions {
* @param maxLines
*/
public static void dumpStackTrace(PrintStream writer, int skipLines, int maxLines) {
- stream(Thread.currentThread().getStackTrace())
+ _NullSafe.stream(Thread.currentThread().getStackTrace())
.map(StackTraceElement::toString)
.skip(skipLines)
.limit(maxLines)
@@ -285,7 +285,7 @@ public final class _Exceptions {
return false;
}
for (String message : messages) {
- if(_Strings.isNotEmpty(message)
+ if(_Strings.isNotEmpty(message)
&& throwableMessage.contains(message)) {
return true;
}
@@ -308,7 +308,7 @@ public final class _Exceptions {
private final E cause;
private FluentException(E cause) {
- requires(cause, "cause");
+ _With.requires(cause, "cause");
this.cause = cause;
}
@@ -327,21 +327,21 @@ public final class _Exceptions {
}
public void rethrowIf(Predicate<E> condition) throws E {
- requires(condition, "condition");
+ _With.requires(condition, "condition");
if(condition.test(cause)) {
throw cause;
}
}
public void suppressIf(Predicate<E> condition) throws E {
- requires(condition, "condition");
+ _With.requires(condition, "condition");
if(!condition.test(cause)) {
throw cause;
}
}
public void rethrowIfMessageContains(String string) throws E {
- requires(string, "string");
+ _With.requires(string, "string");
final boolean containsMessage = getMessage().map(msg->msg.contains(string)).orElse(false);
if(containsMessage) {
throw cause;
@@ -349,7 +349,7 @@ public final class _Exceptions {
}
public void suppressIfMessageContains(String string) throws E {
- requires(string, "string");
+ _With.requires(string, "string");
final boolean containsMessage = getMessage().map(msg->msg.contains(string)).orElse(false);
if(!containsMessage) {
throw cause;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
index c37920f..c11e355 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.exceptions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
index fb8a34b..f1f5de7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class InstanceCreationClassException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
index 4229e56..f8cdf87 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class InstanceCreationException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
index dca2f62..8393a72 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.context._Context;
public final class InstanceUtil {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
index 157d84a..1b74e1c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.commons.internal.factory;
+package org.apache.isis.core.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class UnavailableClassException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
similarity index 87%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
index ca9fa45..a1de1c0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
@@ -18,11 +18,11 @@
*/
/**
- * Provides a {@link org.apache.isis.commons.internal.factory.InstanceUtil utility}
+ * Provides a {@link org.apache.isis.core.commons.internal.factory.InstanceUtil utility}
* class for instantiating classes, ensuring that
* they are assignable from a specified interface (if supplied).
*
* <p>
* Used in various places throughout the framework.
*/
-package org.apache.isis.commons.internal.factory;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.factory;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
index c548c5e..726f8a9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
import java.util.function.Consumer;
import java.util.function.Function;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
index 849056d..23ad986 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
import java.util.function.Function;
-import org.apache.isis.commons.internal.functions._Functions.IndexAwareFunction;
+import org.apache.isis.core.commons.internal.functions._Functions.IndexAwareFunction;
/**
* Package private mixin for _Functions. <br/>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
index a708e02..9b0b707 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.functions;
+package org.apache.isis.core.commons.internal.functions;
import java.util.Objects;
import java.util.function.Predicate;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
similarity index 95%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
index c37920f..d7b8bc1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.functions;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
index 45817f2..a721ab5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
/**
* Top level object classification.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
index aecd551..a37ce0c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
import java.lang.annotation.Annotation;
import java.util.NoSuchElementException;
@@ -26,8 +26,8 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
index 42ac32b..ec1a5e3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
/**
* @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
index 93b9ed6..4becdd3 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc;
+package org.apache.isis.core.commons.internal.ioc;
import javax.annotation.Priority;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
index dd6e5de..ad1ab6d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
import javax.enterprise.inject.spi.Bean;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
index 815e92f..a768e25 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
import java.util.stream.Stream;
import javax.enterprise.inject.spi.CDIProvider;
-import org.apache.isis.commons.internal.context._Plugin;
+import org.apache.isis.core.commons.internal.context._Plugin;
/**
* No longer used since 2.0.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
index e7fab62..f6e86e9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
import java.lang.annotation.Annotation;
import java.util.Collection;
@@ -38,15 +38,16 @@ import javax.enterprise.inject.spi.CDIProvider;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Qualifier;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.functions._Functions.CheckedRunnable;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
@@ -73,7 +74,7 @@ public final class _CDI {
return;
}
- requires(onDiscover, "onDiscover");
+ _With.requires(onDiscover, "onDiscover");
// plug in the provider
final CDIProvider standaloneCDIProvider = CdiPlugin.get().getCDIProvider(onDiscover.get());
@@ -109,7 +110,7 @@ public final class _CDI {
* @return non-null {@code Bin}
*/
public static <T> Can<T> select(final Class<T> subType, Collection<Annotation> qualifiers) {
- if(isEmpty(qualifiers)) {
+ if(_NullSafe.isEmpty(qualifiers)) {
return select(subType);
}
@@ -141,7 +142,7 @@ public final class _CDI {
* @return non-null
*/
public static List<Annotation> filterQualifiers(final Annotation[] annotations) {
- return stream(annotations)
+ return _NullSafe.stream(annotations)
.filter(_CDI::isQualifier)
.collect(Collectors.toList());
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
index 8f5c49a..b0e32ab 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.cdi;
+package org.apache.isis.core.commons.internal.ioc.cdi;
-import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
+import org.apache.isis.core.commons.internal.functions._Functions.CheckedRunnable;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
index 769a3b3..2fa2189 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
import org.springframework.beans.factory.ObjectProvider;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
index a7733c1..39356b4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
import java.lang.annotation.Annotation;
import java.util.concurrent.CompletionStage;
@@ -27,7 +27,7 @@ import javax.enterprise.util.TypeLiteral;
import org.springframework.context.ApplicationEventPublisher;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
similarity index 86%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
index 63ce48b..bfda14e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
import java.lang.annotation.Annotation;
import java.util.Optional;
@@ -28,13 +28,12 @@ import javax.annotation.Nullable;
import org.springframework.context.ApplicationContext;
import org.springframework.core.ResolvableType;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._With;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@@ -83,7 +82,7 @@ public class IocContainerSpring implements IocContainer {
@Override
public <T> Can<T> select(final Class<T> requiredType) {
- requires(requiredType, "requiredType");
+ _With.requires(requiredType, "requiredType");
val allMatchingBeans = springContext.getBeanProvider(requiredType)
.orderedStream()
@@ -97,7 +96,7 @@ public class IocContainerSpring implements IocContainer {
final Class<T> requiredType,
@Nullable Set<Annotation> qualifiersRequired) {
- requires(requiredType, "requiredType");
+ _With.requires(requiredType, "requiredType");
if(_NullSafe.isEmpty(qualifiersRequired)) {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
index b2ea841..9baa1fb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.ioc.spring;
+package org.apache.isis.core.commons.internal.ioc.spring;
import java.lang.annotation.Annotation;
import java.util.Collections;
@@ -36,10 +36,10 @@ import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -142,7 +142,7 @@ public class _Spring {
if(_NullSafe.isEmpty(annotations)) {
return Collections.emptySet();
}
- return stream(annotations)
+ return _NullSafe.stream(annotations)
.filter(_Spring::isGenericQualifier)
.collect(Collectors.toSet());
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
index ef9ea84..d200e63 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.memento;
+package org.apache.isis.core.commons.internal.memento;
import java.io.ObjectInput;
import java.io.ObjectOutput;
@@ -27,8 +27,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
similarity index 81%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
index 5b3a4d1..2d919f6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.memento;
+package org.apache.isis.core.commons.internal.memento;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,16 +31,15 @@ import java.util.Set;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.memento._Mementos.EncoderDecoder;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.base._With;
/**
*
@@ -65,9 +64,9 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
SerializingAdapter serializer,
Map<String, Serializable> valuesByKey) {
- this.codec = requires(codec, "codec");
- this.serializer = requires(serializer, "serializer");
- this.valuesByKey = requires(valuesByKey, "valuesByKey");
+ this.codec = _With.requires(codec, "codec");
+ this.serializer = _With.requires(serializer, "serializer");
+ this.valuesByKey = _With.requires(valuesByKey, "valuesByKey");
}
@Override
@@ -75,7 +74,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
if(value==null) {
return this; //no-op, there is no point in storing null values
}
- requires(name, "name");
+ _With.requires(name, "name");
valuesByKey.put(name, serializer.write(value));
return this;
}
@@ -108,7 +107,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
// -- PARSER
static Memento parse(EncoderDecoder codec, SerializingAdapter serializer, @Nullable String str) {
- requires(codec, "codec");
+ _With.requires(codec, "codec");
if(_NullSafe.isEmpty(str)) {
return null;
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
index e2f466e..23beec0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.context;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.memento;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
index b7743f5..ec616eb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal;
\ No newline at end of file
+package org.apache.isis.core.commons.internal;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
index 8363c03..1320cd0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins;
+package org.apache.isis.core.commons.internal.plugins;
public class PluginResolveException extends RuntimeException {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
index c73a19a..2c691a2 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.core.commons.internal.plugins.codegen;
import java.lang.reflect.InvocationHandler;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
index 59f689d..c47b209 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.core.commons.internal.plugins.codegen;
import javax.annotation.Nullable;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
index 8fbc9bd..73b2276 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
public interface ConversationContextHandle extends AutoCloseable {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
index 78eea53..f89c5bf 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
public interface ConversationContextService {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
index a61ca95..070bcbd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.ioc;
+package org.apache.isis.core.commons.internal.plugins.ioc;
/**
* Acts as a no-op implementation, that is used as lowest priority default, whenever
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
index e1133ea..dd5f885 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.MergedAnnotations;
import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
import org.springframework.util.ReflectionUtils;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
index 64c08f1..92037bd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -32,10 +32,11 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
@@ -306,7 +307,7 @@ public final class _AnnotationsLegacy {
Class<?> type,
Predicate<Method> filter) {
- return stream(type.getDeclaredMethods())
+ return _NullSafe.stream(type.getDeclaredMethods())
.filter(filter)
.findFirst()
.orElse(null);
@@ -318,7 +319,7 @@ public final class _AnnotationsLegacy {
Predicate<Field> filter,
Consumer<Field> onField) {
- stream(type.getDeclaredFields())
+ _NullSafe.stream(type.getDeclaredFields())
.filter(filter)
.forEach(onField);
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
index bddcb09..af7a906 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
index f208630..8cde5cc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -27,7 +27,7 @@ import java.util.function.Function;
import org.springframework.core.annotation.MergedAnnotations;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
index 9372bf7..f3c91f7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -37,7 +37,7 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
similarity index 89%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
index 6618481..bab04a5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -24,9 +24,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.isis.commons.internal.context._Context;
-
-import static org.apache.isis.commons.internal.collections._Arrays.emptyToNull;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.collections._Arrays;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -71,7 +70,7 @@ public final class _MethodCache implements AutoCloseable {
}
}
- return methodsByKey.get(Key.of(type, name, emptyToNull(paramTypes)));
+ return methodsByKey.get(Key.of(type, name, _Arrays.emptyToNull(paramTypes)));
}
public int size() {
@@ -90,7 +89,7 @@ public final class _MethodCache implements AutoCloseable {
private final Class<?>[] paramTypes;
public static Key of(Class<?> type, Method method) {
- return Key.of(type, method.getName(), emptyToNull(method.getParameterTypes()));
+ return Key.of(type, method.getName(), _Arrays.emptyToNull(method.getParameterTypes()));
}
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
index ca0c6de..f37e801 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
@@ -43,11 +43,12 @@ import javax.annotation.Nullable;
import org.springframework.core.annotation.AnnotationUtils;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._With;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
@@ -75,7 +76,7 @@ public final class _Reflect {
if(method.getParameterCount()!=superMethod.getParameterCount()) {
return false;
}
- return _Arrays.testAllMatch(method.getParameters(), superMethod.getParameters(),
+ return _Arrays.testAllMatch(method.getParameters(), superMethod.getParameters(),
(p1, p2)->p1.getType().equals(p2.getType()));
}
@@ -94,7 +95,7 @@ public final class _Reflect {
* @return
*/
public static <T extends Member> Predicate<T> withName(final String memberName) {
- requires(memberName, "memberName");
+ _With.requires(memberName, "memberName");
return m -> m != null && memberName.equals(m.getName());
}
@@ -104,7 +105,7 @@ public final class _Reflect {
* @return
*/
public static <T extends Member> Predicate<T> withPrefix(final String prefix) {
- requires(prefix, "prefix");
+ _With.requires(prefix, "prefix");
return m -> m != null && m.getName().startsWith(prefix);
}
@@ -123,7 +124,7 @@ public final class _Reflect {
* @return
*/
public static <T> Predicate<Field> withTypeAssignableTo(final Class<T> type) {
- requires(type, "type");
+ _With.requires(type, "type");
return (Field f) -> f != null && type.isAssignableFrom(f.getType());
}
@@ -143,9 +144,9 @@ public final class _Reflect {
return Stream.empty();
}
if(ignoreAccess) {
- return stream(type.getDeclaredFields());
+ return _NullSafe.stream(type.getDeclaredFields());
}
- return stream(type.getFields());
+ return _NullSafe.stream(type.getFields());
}
/**
@@ -178,9 +179,9 @@ public final class _Reflect {
return Stream.empty();
}
if(ignoreAccess) {
- return stream(type.getDeclaredMethods());
+ return _NullSafe.stream(type.getDeclaredMethods());
}
- return stream(type.getMethods());
+ return _NullSafe.stream(type.getMethods());
}
/**
@@ -323,8 +324,8 @@ public final class _Reflect {
final boolean searchSupers,
final boolean ignoreAccess) {
- requires(method, "method");
- requires(annotationCls, "annotationCls");
+ _With.requires(method, "method");
+ _With.requires(annotationCls, "annotationCls");
if (!ignoreAccess && !isAccessible(method)) {
return null;
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
similarity index 94%
copy from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
copy to core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
index c37920f..e721fb8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.reflection;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
index ef8daf1..8c08c43 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
import java.io.File;
import java.io.IOException;
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.isis.commons.internal.base._Either;
+import org.apache.isis.core.commons.internal.base._Either;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
index eef52d6..3711689 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
import java.io.IOException;
import java.io.InputStream;
@@ -28,11 +28,10 @@ import java.util.regex.Pattern;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-
-import static org.apache.isis.commons.internal.base._With.requires;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.base._With;
/**
* <h1>- internal use only -</h1>
@@ -57,8 +56,8 @@ public final class _Resources {
*/
public static InputStream load(Class<?> contextClass, String resourceName) {
- requires(contextClass, "contextClass");
- requires(resourceName, "resourceName");
+ _With.requires(contextClass, "contextClass");
+ _With.requires(resourceName, "resourceName");
final String absoluteResourceName = resolveName(resourceName, contextClass);
@@ -92,7 +91,7 @@ public final class _Resources {
* @return The resource location as an URL, or null if the resource could not be found.
*/
public static URL getResourceUrl(Class<?> contextClass, String resourceName) {
- requires(resourceName, "resourceName");
+ _With.requires(resourceName, "resourceName");
final String absoluteResourceName = resolveName(resourceName, contextClass);
return _Context.getDefaultClassLoader().getResource(absoluteResourceName);
}
@@ -109,7 +108,7 @@ public final class _Resources {
* @param resourcePath
*/
public static boolean isLocalResource(String resourcePath) {
- requires(resourcePath, "resourcePath");
+ _With.requires(resourcePath, "resourcePath");
return !externalResourcePattern.test(resourcePath);
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
index c37920f..3c70d63 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
@@ -25,4 +25,4 @@
* Do NOT use any of the classes provided by this package!
* </p>
*/
-package org.apache.isis.commons.internal.compare;
\ No newline at end of file
+package org.apache.isis.core.commons.internal.resources;
\ No newline at end of file
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
rename to core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
index 6835311..6802c6c 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.url;
+package org.apache.isis.core.commons.internal.url;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
index 1b16849..6b28d14 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.handlers;
+package org.apache.isis.core.commons.handlers;
import java.util.Arrays;
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
import lombok.val;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
index 27b1c00..527f732 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized.Parameters;
import static org.hamcrest.Matchers.lessThan;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
public class BytesTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
index 9d61563..43d6137 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.Arrays;
import java.util.Collection;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
similarity index 94%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
index 438858e..2a4bbe2 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.util.List;
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
public class ReductionTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
similarity index 98%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
index 0a93335..7f5cf05 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.base;
+package org.apache.isis.core.commons.internal.base;
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
public class StringsTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
similarity index 93%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
index 5cb8f3c..e8b927f 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.cdi;
+package org.apache.isis.core.commons.internal.cdi;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
@@ -26,6 +26,7 @@ import javax.annotation.CheckForNull;
import javax.inject.Inject;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.isis.commons.internal.ioc.cdi._CDI;
+import org.apache.isis.core.commons.internal.ioc.cdi._CDI;
class CDITest {
@@ -83,7 +84,7 @@ class CDITest {
//then
assertNotNull(annotation);
- assertTrue(_CDI.isQualifier(annotation));
+ Assertions.assertTrue(_CDI.isQualifier(annotation));
}
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
similarity index 95%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
index 47316ef..91f6c60 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.cdi;
+package org.apache.isis.core.commons.internal.cdi;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
index f4d83a9..d2e3c1d 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import org.junit.jupiter.api.Test;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
index e452534..d20bef6 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.collections;
+package org.apache.isis.core.commons.internal.collections;
import java.util.HashMap;
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import lombok.val;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
index d659f22..d83abf0 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.collections.snapshot;
+package org.apache.isis.core.commons.internal.collections.snapshot;
import java.util.stream.Collectors;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
index 66b9fc6..38ab446 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.compare;
+package org.apache.isis.core.commons.internal.compare;
import java.util.Arrays;
import java.util.Collection;
@@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
public class ComparatorsTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
similarity index 96%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
index 84e6d70..664af9c 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.concurrent;
+package org.apache.isis.core.commons.internal.concurrent;
import java.util.concurrent.atomic.LongAdder;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
similarity index 99%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
index 7ab466f..a6a1470 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.context;
+package org.apache.isis.core.commons.internal.context;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
similarity index 99%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
index 65fd650..ac1a947 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.encoding;
+package org.apache.isis.core.commons.internal.encoding;
import java.io.IOException;
import java.io.PipedInputStream;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
index 654ca2a..0cbe64b 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.resources;
+package org.apache.isis.core.commons.internal.resources;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java b/core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
similarity index 97%
rename from core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
rename to core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
index c61e84c..2d34cd8 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
+++ b/core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.commons.internal.strings;
+package org.apache.isis.core.commons.internal.strings;
import org.junit.Test;
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index a0bb33e..a8911ae 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -21,7 +21,7 @@ package org.apache.isis.config;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.experimental.UtilityClass;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index a91d48c..9fca5a7 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -43,8 +43,8 @@ import org.springframework.validation.annotation.Validated;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
index eb30971..d379ce4 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCommons;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.validators.PatternOptionalStringConstraintValidator;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index 073060b..3aa745a 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -36,14 +36,14 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.ViewModel;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.BeanSort;
-import org.apache.isis.commons.internal.reflection._Reflect;
-
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.reflection._Annotations.findNearestAnnotation;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
+
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.reflection._Annotations.findNearestAnnotation;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
index cf03343..ba171f6 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.config.beans;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
index 5988909..8f0b282 100644
--- a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.messages;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
public class MessageRegistry {
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
index b9bf8a1..6253934 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.config.metamodel.specloader;
-import org.apache.isis.commons.internal.environment.DeploymentType;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
index c11057f..cadfcb9 100644
--- a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.util;
import java.util.Map;
import java.util.function.Supplier;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.ConfigurationConstants;
import lombok.experimental.UtilityClass;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
index 0775644..ac9625d 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
@@ -31,8 +31,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.resources._Resources;
import lombok.Getter;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
similarity index 92%
rename from core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
index 438b6c2..b9dd308 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.commons.internal.reflection;
+package org.apache.isis.core.commons.internal.reflection;
import java.lang.reflect.Method;
import java.util.List;
@@ -33,12 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.jaxb.JaxbServiceDefault;
-import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
+import org.apache.isis.core.commons.internal.reflection._Reflect.InterfacePolicy;
import org.apache.isis.metamodel.services.user.UserServiceDefault;
-import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamTypeHierarchy;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.getAnnotation;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllMethods;
+import static org.apache.isis.core.commons.internal.reflection._Reflect.streamTypeHierarchy;
//TODO we are using real world classes from the framework, we could instead isolate these tests
// if we provide some custom classes for hierarchy traversal here (could be nested);
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index 634a1fc..cee8c6a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.unittestsupport.bidir;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
index bd6081f..e0cf993 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.unittestsupport.comparable;
-import static org.apache.isis.commons.internal.base._NullSafe.compareNullsFirst;
+import static org.apache.isis.core.commons.internal.base._NullSafe.compareNullsFirst;
public class CategorizedDomainObject implements Comparable<CategorizedDomainObject> {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index 3639639..4ba68a5 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
class ImposteriserTestUsingCodegenPlugin {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
index 64783c0..ff08169 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.adapter.oid;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class ObjectPersistenceException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
index d8a935b..355e4f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
@@ -25,14 +25,14 @@ import java.util.regex.Pattern;
import java.util.stream.Stream;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.apache.isis.commons.internal.base._Strings.splitThenStream;
+import static org.apache.isis.core.commons.internal.base._Strings.splitThenStream;
/**
* Factory for subtypes of {@link Oid}, based on their oid str.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
index b4c3640..4c1523a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
final class Oid_Parented implements ParentedOid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
index d4794ad..fc6dc08 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.adapter.oid;
import java.util.Objects;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
index b84c7d3..d667023 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.adapter.oid;
import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
index 812dbe2..a1bc037 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.adapter.oid;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.url.UrlDecoderUtil;
+import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.schema.common.v1.OidDto;
public interface RootOid extends Oid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
index 6aae478..5d51eeb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ArrayExtensions.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public final class ArrayExtensions {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
index 245cf38..ebd190a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassExtensions.java
@@ -25,10 +25,10 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.resources._Resources;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
index 4641610..0ca3c73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ClassUtil.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
index 79e389e1..a04a7b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
@@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
public final class ListExtensions {
private static final String DEFAULT_DELIMITER = ",";
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
index f879243..0f67f40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/LocaleUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.commons;
import java.util.Locale;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
public class LocaleUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
index ed92b7d..b88a8cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
@@ -26,12 +26,12 @@ import java.util.List;
import java.util.Set;
import java.util.SortedSet;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
index 2f7c762..6489f9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ObjectExtensions.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
/**
* Helpers to co-erce non-generic values into type-safe generics without
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
index 8892ea2..a6dcd1a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ResourceUtil.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
import javax.servlet.http.HttpServletRequest;
-import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.context._Context;
public class ResourceUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
index c5c644f..1d2dd47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/StringExtensions.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.StringTokenizer;
import org.apache.isis.applib.util.Enums;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.resources._Resources;
public final class StringExtensions {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
index 87e8b86..cf77e5f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ThrowableExtensions.java
@@ -24,7 +24,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.function.Consumer;
import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.specloader.ReflectiveActionException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
index d8a8238..c7d5b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.consent;
import java.util.Map;
import java.util.function.Consumer;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.interactions.InteractionAdvisorFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
index feee12a..e4b9882 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.consent;
import org.apache.isis.metamodel.facetapi.Facet;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
public class Veto extends ConsentAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
index ca84ccd..03c3268 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
@@ -20,7 +20,6 @@ package org.apache.isis.metamodel.context;
import java.util.stream.Stream;
-import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -28,7 +27,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
index 6f5a906..d00dd34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -31,11 +30,11 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.IocContainer;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.IocContainer;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.ServiceUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
index 8353664..4f655c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
index 4cc4155..266e73d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/MetaModelException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class MetaModelException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
index 2aede02..23f6e4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/persistence/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.exceptions.persistence;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
public class ObjectPersistenceException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
index 4d0375d..c97a0c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
@@ -24,11 +24,11 @@ import java.util.Objects;
import java.util.Set;
import java.util.function.Consumer;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.context.MetaModelContext;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.Setter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
index 7276254..d31d7ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
@@ -23,14 +23,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Maps.AliasMap;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps.AliasMap;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
import lombok.Getter;
import lombok.Setter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
index 80b939e..d09d748 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
@@ -44,16 +44,16 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.reflection._Annotations;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.metamodel.commons.MethodUtil;
import org.apache.isis.metamodel.commons.ThrowableExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
public final class Annotations {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
index 2832af7..6f7ed64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/CollectionUtils.java
@@ -36,11 +36,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.function.Function;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._With;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._With;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
index cd760e0..1e62fd0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import lombok.Builder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
index 950ac40..5257176 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.services.events.MetamodelEventService;
import org.apache.isis.metamodel.spec.ManagedObject;
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
index b7122c6..2915b33 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetFactory.java
@@ -27,8 +27,8 @@ import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
import org.apache.isis.metamodel.commons.CanBeVoid;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
index ec54633..fbbbc13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/FacetedMethod.java
@@ -25,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
index a8529a5..efa52c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectMember;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
index 343f277..f3ff17e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodFinderUtils.java
@@ -29,7 +29,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.reflection._MethodCache;
+import org.apache.isis.core.commons.internal.reflection._MethodCache;
import org.apache.isis.metamodel.commons.MethodUtil;
import org.apache.isis.metamodel.facetapi.MethodRemover;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
index 3f8184b..8e7ebf6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 72d87ec..c2bdcce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -19,14 +19,12 @@
package org.apache.isis.metamodel.facets;
import java.util.EnumSet;
-import java.util.function.Consumer;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
index 14f923d..6b183b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/OrphanedSupportingMethodValidator.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
index b2676d8..f54129b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets;
import java.util.EnumSet;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.metamodel.facetapi.FeatureType;
public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
index c430b86..d304446 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
@@ -26,8 +26,8 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index ba47ac8..316ab5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -24,8 +24,8 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
index 21c2b9c..180c04d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.actions.action.invocation;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 7d6a057..71fc7df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -47,12 +47,12 @@ import org.apache.isis.applib.services.metamodel.MetaModelService.Mode;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.metamodel.commons.MethodInvocationPreprocessor;
import org.apache.isis.metamodel.commons.ThrowableExtensions;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
index 9892069..dc29117 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/CommandUtil.java
@@ -22,9 +22,8 @@ package org.apache.isis.metamodel.facets.actions.action.invocation;
import java.util.List;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index e8c628a..cac90e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.RestrictTo;
-import org.apache.isis.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
index 675b3a9..c5f8f93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.actions.defaults.method;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
index 6d67fc9..67989c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.fileaccept;
import java.util.Optional;
import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 60d874c..b8a8733 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.HomePage;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
+import static org.apache.isis.core.commons.internal.functions._Predicates.not;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
index 3c5c54d..9d2c008 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
index 2e8cc31..5d9b8df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.layout;
import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
index 01a8a89..0c31ee1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
index eb9ad31..6314ee8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.layout;
import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
index 600a4a3..23ee662 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
index 78b223c..fdb5bba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.layout;
import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
index cfd7087..ee47a11 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
index 06e5f3c..a44c896 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/NamedFacetForActionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.actions.layout;
import org.apache.isis.applib.layout.component.ActionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index 73dd3c6..9de5811 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.prototype;
import java.util.Map;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.environment.DeploymentType;
+import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
index 898d96e..e9f81c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.actions.validate;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
index b38f5f9..4f134f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
index ac6cf75..0b317a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.actions.validate.method;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
index 42ed32b..9371761 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
@@ -25,11 +25,11 @@ import java.util.Map;
import java.util.function.Consumer;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.base._With.computeIfAbsent;
+import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
index e27b8c5..1feb3fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/i18n/TranslationFacetFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.facets.all.i18n;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
index dfab40c..b4ec364 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
index 62ffd1f..e5d7b4c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.CanBeVoid;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
index 0b8e22a..0d23f4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/clear/CollectionClearFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.collections.clear;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 7db9dea..f7117a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -27,7 +27,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
index 4392bc7..ff3d01d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public abstract class CollectionAddToFacetForDomainEventFromAbstract
extends SingleValueFacetAbstract<Class<? extends CollectionDomainEvent<?,?>>>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 7f31d2f..6f5e096 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facets.DomainEventHelper;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
index 7d4f8d6..76e2f39 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -35,7 +35,7 @@ import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromF
import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public abstract class CollectionRemoveFromFacetForDomainEventFromAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
index 8e670a3..49bcc35 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java
@@ -19,8 +19,8 @@
package org.apache.isis.metamodel.facets.collections.javautilcollection;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index 71fe7d7..ff47cc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -22,14 +22,14 @@ package org.apache.isis.metamodel.facets.collections.javautilcollection;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.CollectionFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-import static org.apache.isis.commons.internal.collections._Arrays.toArray;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.collections._Arrays.toArray;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index ae6fb43..016ca9b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.CollectionFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
index 41616eb..4435aa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
index f557e26..fcb992d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.collections.layout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index a452bc7..5a5d020 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
index 535ecd6..0d7ee2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.collections.layout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
index 5af3f75..b4734df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
index a19fd49..7449d4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.collections.layout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
index cb6d53b..17ac6ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
index d7e0475..66acbe3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.collections.layout;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 994ca89..2c0e8fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public class SortedByFacetForCollectionLayoutAnnotation extends SortedByFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index 8b1b54f..d27ea6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
index 3533eb3..ddcc3fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.modify;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
index 18434a6..9d3bce2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
@@ -25,7 +25,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
index 081e628..45ee5f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.MethodUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
index 4f35306..5ec5de2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java
@@ -23,8 +23,8 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleStringValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
index 68cca14..2c83154 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.cssclassfa.annotprop;
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
import org.apache.isis.metamodel.specloader.specimpl.ObjectMemberAbstract;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
index 60ea5df..14c4129 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/DisabledFacetAbstractImpl.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.disabled;
import java.util.Map;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index b692ad6..1188c8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.interactions.UsabilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index 562d659..77e287f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.disabled.method;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
index c7c6205..32cd9c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.hidden;
import java.util.Properties;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
index 23052a6..20325bc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index 7980d8f..98c7766 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.members.hidden.method;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
index 241b9e7..92834c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/order/MemberOrderFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.members.order;
import java.util.Map;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
index 2381722..e542129 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacetFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.MethodFinderUtils;
import org.apache.isis.metamodel.facets.MethodLiteralConstants;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
index d0bbb02..8f41e5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
index dc6f771..4dca20d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadCallbackFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.MethodFinderUtils;
import org.apache.isis.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
index d3ce827..67eb463 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
index 0b99dd2..57bfe85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
index 6c6e976..b014d9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistCallbackViaSaveMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
index 6e93bf4..9dac54d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
index 67cac82..8681d40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
index 8e9047d..869ac40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
index 174b731..771d5a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemoveCallbackViaDeleteMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
index e278508..65a8367 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
index 6967839..5771c40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdateCallbackFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
index 4bc7d91..12861ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
index e4c12a8..5139d2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.Wormhole;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
index f8ecdc6..5eeb69e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.callbacks;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
index a913a5c..8ee0b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/choices/enums/EnumFacetUsingValueFacetUsingSemanticsProviderFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.choices.enums;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
index d6a0ea1..1611baf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclass/method/CssClassFacetMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.cssclass.method;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.MethodFinderUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
index 06efd1c..94669aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
@@ -18,7 +18,7 @@
package org.apache.isis.metamodel.facets.object.cssclassfa.annotation;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
index bdda591..34e26ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForViewModelLayoutFactory.java
@@ -18,7 +18,7 @@
package org.apache.isis.metamodel.facets.object.cssclassfa.annotation;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
index 19dbc10..419b689 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
index e99f755..847a43c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
index f09c6db..e83d1d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.Annotations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
index 5b34e1e..6f1f80b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.disabled.method;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 4fe237e..ed6f660 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index fe55eb9..c917222 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.auditing;
import java.util.Optional;
import org.apache.isis.applib.annotation.Auditing;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 00bc18c..a0eb9fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
index c393485..b33c791 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.editing;
import java.util.Map;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
index ad66031..23f6d91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobject.objectspecid;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
index 4485aa6..1eb7ef6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
index 91f2f2d..4f6c61e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
index 719e1f7..9d86f9b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForViewModelLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
index e516c28..8c60752 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
index 86d2df5..82e0886 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
index b919bb9..99c9bb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetForViewModelLayoutAnnotation.java
@@ -19,7 +19,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index dcc949f..b973974 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index e4a4e04..c3bcf28 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
index 247b240..70cd731 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
index 46ffdec..114cb6b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
index 90f9a3b..9a6744c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForViewModelLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 52a37f5..4fed04b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -18,7 +18,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.services.events.MetamodelEventService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index cda77d8..1854a705 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index 2869350..0f0fe83 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
index f4a847f..98d8c58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
index a91ede5..a286e90 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
index 64d4479..2c2f35d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
index cefeff3..4851ea0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectXml.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
index d5c7326..34a8a3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 11d8a48..e500f85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index 497f3fd..f995a58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index eb27155..786eb8a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.Objects;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.object.domainservicelayout.annotation.DomainServiceLayoutFacetAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
index 0e29159..b2263b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.encodeable.encoder;
import org.apache.isis.applib.adapters.EncoderDecoder;
-import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.assertions._Assert;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
index 809654d..3dd07bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
index 4803106..f362229 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/grid/GridFacetFactory.java
@@ -17,7 +17,7 @@
package org.apache.isis.metamodel.facets.object.grid;
import org.apache.isis.applib.services.grid.GridService;
-import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
index a7c859a..88a5784 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.hidden.method;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
index abf5a04..3eb5f8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/icon/method/IconFacetMethodFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.icon.method;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index f775735..6ecb035 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -28,15 +28,15 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MethodRemover;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
index a0f8840..d560e17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.object.ignore.datanucleus;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index 7323b1f..b55440f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.List;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
index 4392d7f..0082af3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.ignore.jdo;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
index d5fc851..c2cc832 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/layout/LayoutFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.layout;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.MethodFinderUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
index 9d37775..01ff508 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.mixin;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorForValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
index 1e67e52..eeffe6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
index f8aaad2..fd8530a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/mixin/MixinFacetForMixinAnnotation.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Constructor;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index 716a876..9b6471f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
index a63698b..33c4002 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/navparent/method/NavigableParentFacetMethod.java
@@ -23,7 +23,7 @@ import java.lang.invoke.MethodHandle;
import java.lang.reflect.Method;
import java.util.Map;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.navparent.NavigableParentFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
index 0f9c687..998a69b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/InvalidEntryException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.parseable;
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
/**
* Indicates that a value entry is not valid. Note the entry may still parse
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
index 4d64aff..e3ff986 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public final class ParserUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
index 2f8063e..39d5db5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/TextEntryParseException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.parseable;
-import org.apache.isis.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.exceptions.IsisApplicationException;
/**
* Indicates that a text entry could not be satisfactorily parsed into a useful
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index 42785bc..dcb043f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.recreatable;
import java.util.stream.Stream;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.PostConstructMethodCache;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index fb80a32..3652f5d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.ViewModel;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
index 0367f12..58f6541 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 06d8065..7fea1f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -25,8 +25,8 @@ import java.util.Objects;
import java.util.function.Function;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
index da2bcfd..f5e7ec4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.title.methods;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
index addc9bc..9187a3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.validating.validateobject.method
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
index 8710c70..54f939e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.value.annotcfg;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.ValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
index 5073cd1..1d6b05a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.object.value.annotcfg;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index be6f4f1..3e0f78b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.commons.LocaleUtil;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index ff3de3c..b14d26c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -20,12 +20,12 @@
package org.apache.isis.metamodel.facets.object.value.vsp;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
public final class ValueSemanticsProviderUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
index 75bff6c..ad01336 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.objectvalue.mandatory;
import java.util.Map;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
index 2c382aa..d2868da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
index bea5de8..b46dbb4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.autocomplete;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index 38ab87b..ec984c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -24,8 +24,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
index 2a7bf97..ce2ef7f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.param.autocomplete.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
index 0032dbf..ca17177 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.choices;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
index e380b79..4a3ed63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.choices;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
index 48cb14c..c5f138c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
@@ -21,8 +21,7 @@ package org.apache.isis.metamodel.facets.param.choices.enums;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.TypedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index f7d1a94..e4403d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
index 7f239e2..7c25b00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.param.choices.method;
import java.lang.reflect.Method;
import java.util.Collection;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index ba626b7..9bff8cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -24,8 +24,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
index e51e1f1..7323df6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.param.choices.methodnum;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
index 1c5c847..91b148c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.defaults;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index 9311426..43c4736 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
index f945dfa..1e48ba1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.param.defaults.methodnum;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
index 94c3b42..8b29a57 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.disable;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
index 74db06c..043af12 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.param.disable.ActionParameterDisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
index 8031125..21a2850 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.param.disable.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
index 1f802c6..69aa639 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facets.param.hide;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
index 6782ad2..dafa9fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.param.hide.ActionParameterHiddenFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
index 4ff9a0f..311c2cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.param.hide.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
index 9f5a917..652b274 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
index 5d0ed06..1f374d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
index 60f5dbe..642bfc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.layout;
import java.util.Optional;
import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
index eb0a2ee..e1b6fe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.parameter.fileaccept;
import java.util.Optional;
import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
index 7c3a876..de3fc15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
index 6fcb3f9..ef2023d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.parameter.regex;
import java.util.Optional;
import java.util.regex.Pattern;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
index e3e0c07..c074df6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.param.validate.method;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
index 8392f58..a33a74f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.properties.accessor;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.CanBeVoid;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index c172cd7..bdb7b62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.CollectionUtils;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
index 2d127ee..eee3e50 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.properties.autocomplete.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index 0649ae8..f49d819 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.properties.choices.enums;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
index 789d518..85b1062 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.properties.choices.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index b8d5c71..bf78038 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
index 052010b..289beb1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.properties.defaults.method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
index d133fb6..71f7489 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.property.fileaccept;
import java.util.Optional;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.isis.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 69a2610..86c63d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facets.DomainEventHelper;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 7eb76f4..046678c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.command.spi.CommandService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -48,7 +48,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
index c4ef306..141b690 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.regex.Pattern;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
index db4250f..5518ded 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
index ce66195..b08644f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
index 7657fad..01a7604 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.properties.propertylayout;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
index b4c1129..c95bbe7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
index a55a59d..257e50d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.properties.propertylayout;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
index 92b13bf..78e0943 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
index 616ef04..e5b4475 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.properties.propertylayout;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
index 55fdf3c..4f76728 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.properties.update;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
index 38e1982..90f4ab0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/update/PropertySetAndClearFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.metamodel.facets.properties.update;
import java.lang.reflect.Method;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
index 7977593..2395c51 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.properties.validating.method;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index d4ba883..ca53ba0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 14a780f..0218d32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -31,8 +31,8 @@ import java.util.StringTokenizer;
import java.util.TimeZone;
import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index e343de0..2e6e038 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
index 25920f7..ac463a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
@@ -29,8 +29,8 @@ import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index 322eb90..3a56f90 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.value.booleans;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index 730b02d..609c0c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index 48b3dfb..fee9048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
index 22eef7f..bc602b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.JodaFunctions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index d46833a..abccad3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -30,8 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index d24a7d3..958c22b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -29,8 +29,8 @@ import org.joda.time.format.ISODateTimeFormat;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
index 52185cf..636597c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index 308d500..bf2b0ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
index ce2d2fb..b6cf881 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.JodaFunctions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index e1d4202..fdd6d5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -31,8 +31,8 @@ import org.joda.time.format.ISODateTimeFormat;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
index a23650c..a756681 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
@@ -26,8 +26,8 @@ import java.awt.image.MemoryImageSource;
import java.awt.image.PixelGrabber;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
index 4be75cc..871094c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.time.TimeValueSemanticsProviderAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
index e036c94..e97f9ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.InvalidEntryException;
import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
index 2db001a..16bc92f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/treenode/TreeNodeValueSemanticsProvider.java
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.applib.tree.LazyTreeNode;
import org.apache.isis.applib.tree.TreeNode;
import org.apache.isis.applib.tree.TreeState;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.Memento;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.core.commons.internal.memento._Mementos;
+import org.apache.isis.core.commons.internal.memento._Mementos.Memento;
+import org.apache.isis.core.commons.internal.memento._Mementos.SerializingAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
index 8d34fa2..a21c1b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
-import org.apache.isis.commons.internal.base._Tuples;
-import org.apache.isis.commons.internal.base._Tuples.Indexed;
+import org.apache.isis.core.commons.internal.base._Tuples;
+import org.apache.isis.core.commons.internal.base._Tuples.Indexed;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
index 89bf4fa..f7fdb26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/DeweyOrderSet.java
@@ -29,9 +29,9 @@ import java.util.SortedSet;
import java.util.StringTokenizer;
import java.util.TreeSet;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
index 85545ec..f3d4a34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/layout/memberorderfacet/MemberOrderFacetComparator.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.layout.memberorderfacet;
import java.util.Comparator;
-import org.apache.isis.commons.internal.compare._Comparators;
+import org.apache.isis.core.commons.internal.compare._Comparators;
import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
public class MemberOrderFacetComparator implements Comparator<MemberOrderFacet> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
index fc21161..2aea332 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator.java
@@ -19,9 +19,9 @@
package org.apache.isis.metamodel.objectmanager.create;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index 43228a3..8c7ba9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -24,9 +24,9 @@ import java.lang.reflect.Modifier;
import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.object.callbacks.CallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
index 66630d5..1a2894c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier.java
@@ -19,9 +19,9 @@
package org.apache.isis.metamodel.objectmanager.identify;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index f6cd557..5f8a4f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -20,7 +20,7 @@ package org.apache.isis.metamodel.objectmanager.identify;
import java.util.UUID;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
index 6ca438a..67f447f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader.java
@@ -19,9 +19,9 @@
package org.apache.isis.metamodel.objectmanager.load;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
index 81ca9b4..6341e1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/load/ObjectLoader_builtinHandlers.java
@@ -21,9 +21,9 @@ package org.apache.isis.metamodel.objectmanager.load;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
index bd1a572..34786e5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.metamodel.objectmanager.refresh;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.handler.ChainOfResponsibility;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.spec.ManagedObject;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
index c1f5d98..a037a49 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/refresh/ObjectRefresher_builtinHandlers.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.metamodel.objectmanager.refresh;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
index 64ab2ce..e9c1987 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.function.Function;
import org.apache.isis.applib.ApplicationException;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 51dcb61..ef4d517 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -28,8 +28,8 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.reflection._Annotations;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
index 8ba832d..90036b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModel.java
@@ -23,7 +23,7 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.functions._Functions;
+import org.apache.isis.core.commons.internal.functions._Functions;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
index 128a2e7..affba80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Multimaps;
-import org.apache.isis.commons.internal.collections._Multimaps.SetMultimap;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Multimaps;
+import org.apache.isis.core.commons.internal.collections._Multimaps.SetMultimap;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
index 0ae5bd4..ac993f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilter.java
@@ -23,12 +23,12 @@ import java.util.function.Predicate;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.functions._Predicates;
+import org.apache.isis.core.commons.internal.functions._Predicates;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.core.commons.internal.base._NullSafe.isEmpty;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index bc5ca80..cc531da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.metamodel.authorization.standard.AuthorizationFacetFactory;
import org.apache.isis.metamodel.facets.OrphanedSupportingMethodValidator;
import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index e9ee83e..7d57380 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -35,11 +35,11 @@ import org.springframework.core.MethodParameter;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Collections;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Collections;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.exceptions.MetaModelException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
index 3304d24..3b32fe5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceUtil.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.metamodel.services;
-import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.core.commons.internal.assertions._Assert;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
index 39765bd..72f3b0b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeature.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.util.Equality;
import org.apache.isis.applib.util.Hashing;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.collections._Sets;
/**
* Canonical application feature, identified by {@link ApplicationFeatureId},
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
index ce08670..9bbec70 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -39,9 +39,9 @@ import org.apache.isis.applib.util.Hashing;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.metamodel.spec.ObjectSpecId;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 28e0493..75369bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -37,10 +37,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -59,7 +59,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index e3a32c1..1d23a26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.services.classsubstitutor;
import java.util.Set;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Blackhole;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Blackhole;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.specloader.classsubstitutor.ProxyEnhanced;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index d2d5cff..2bc06c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* Aggregates all {@link ClassSubstitutor}s.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
index fb16ced..2078c61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/command/CommandDtoServiceInternal.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.command;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
index 5c230b7..0b1baf5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.events.ui.IconUiEvent;
import org.apache.isis.applib.events.ui.LayoutUiEvent;
import org.apache.isis.applib.events.ui.TitleUiEvent;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.core.commons.internal.ioc.spring._Spring;
@Configuration
@Named("isisMetaModel.MetamodelEventSupport_Spring")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
index aec6f5c..3a6134c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -36,10 +36,10 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridLoaderService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.resources._Resources;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
index fe883fd..a93e13a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -35,8 +35,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Arrays;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
index d96bced..60099fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridLoaderService;
import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.grid.GridSystemService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
@Service
@Named("isisMetaModel.GridServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
index d4a9a34..dbcb663 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -51,10 +51,10 @@ import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index adbc039..e3bdc0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -50,12 +50,12 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
import org.apache.isis.applib.layout.grid.bootstrap3.Size;
import org.apache.isis.applib.mixins.MixinConstants;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
@@ -69,7 +69,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
index 079d111..be84b4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/homepage/HomePageAction.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.homepage;
import java.util.Collections;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
index bc829fe..b542a91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ixn/InteractionDtoServiceInternal.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.services.ixn;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index f4aa4c7..b1ec43e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.layout.LayoutService;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.applib.util.ZipWriter;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
index ba0c7f7..0bee40f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.applib.services.metamodel.DomainMember;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
index cd88934..1a26842 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainModelDefault.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.DomainModel;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
@XmlRootElement(name="domain")
@XmlAccessorType(XmlAccessType.PROPERTY)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
index 006955d..7e1f491 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
@@ -31,9 +31,9 @@ import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.util.schema.CommonDtoUtils;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
index fd0fcd3..334f892 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.DomainModel;
import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
index 05c8eff..a537b5f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
@@ -34,13 +34,13 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.ioc.spring._Spring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
index 696b706..526f1f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.services.title;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.commons.internal.base._Blackhole;
+import org.apache.isis.core.commons.internal.base._Blackhole;
import org.apache.isis.config.messages.MessageRegistry;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
index 97a7b05..01eb4e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.security.RoleMemento;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
index af456e4..14cc4ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/DomainModelException.java
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.spec;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.exceptions.IsisException;
/**
* Thrown when a problem is found with the domain model, and Isis cannot
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index 03d11a4..65589bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -33,11 +33,11 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.domain.DomainObjectList;
-import org.apache.isis.commons.internal.base._Tuples.Indexed;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Tuples.Indexed;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.commons.MethodExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
index b255be0..0ae7b2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.core.commons.internal.base._With.requiresNotEmpty;
import lombok.AccessLevel;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
index ae17d36..e4de7d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
@@ -26,9 +26,9 @@ import java.util.Optional;
import java.util.stream.Stream;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.internal.collections._Streams;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.internal.collections._Streams;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.consent.InteractionResult;
@@ -50,7 +50,6 @@ import org.apache.isis.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.metamodel.interactions.InteractionContext;
import org.apache.isis.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.metamodel.interactions.ObjectValidityContext;
-import org.apache.isis.metamodel.services.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectActionContainer;
import org.apache.isis.metamodel.spec.feature.ObjectAssociationContainer;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
index 478b6ce..8a8eba7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
@@ -35,10 +35,10 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.context.MetaModelContext;
@@ -57,7 +57,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.specimpl.MixedInMember;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
index df5c0ee..6001175 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
@@ -23,11 +23,11 @@ import java.util.Collection;
import java.util.stream.Stream;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.spec.ActionType;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
public interface ObjectActionContainer {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
index fb480d7..f4fa0fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
@@ -25,7 +25,7 @@ import java.util.function.Predicate;
import javax.annotation.Nullable;
import javax.enterprise.inject.Vetoed;
-import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
index d782f6f..4cc87b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAssociation.java
@@ -29,10 +29,10 @@ import java.util.stream.Stream;
import javax.enterprise.inject.Vetoed;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
... 6070 lines suppressed ...