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 18:35:36 UTC

[isis] 11/14: ISIS-2259: search-n-replace for org.apache.isis.runtime -> core, integtestsupport -> testing.integtestsupport.applib

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

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

commit 976e961cca7aec53a4fdd51c9456230643b85892
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:25:38 2020 +0000

    ISIS-2259: search-n-replace for org.apache.isis.runtime -> core, integtestsupport -> testing.integtestsupport.applib
---
 .../mn-1.16.0-to-2.0.0-M1_other-changes.adoc                 |  2 +-
 .../modules/applib-ant/examples/annotation/Defaulted.java    |  2 +-
 .../doc/modules/applib-ant/examples/annotation/Value.java    |  2 +-
 .../modules/applib-cm/examples/domain/DomainObjectList.java  |  2 +-
 .../examples/events/domain/AbstractDomainEvent.java          |  4 ++--
 .../applib-cm/examples/events/domain/EventObjectBase.java    |  4 ++--
 .../applib-cm/examples/events/ui/AbstractUiEvent.java        |  2 +-
 .../examples/layout/component/CollectionLayoutData.java      |  2 +-
 .../applib-cm/examples/layout/component/FieldSet.java        |  2 +-
 .../examples/layout/component/PropertyLayoutData.java        |  2 +-
 .../modules/applib-cm/examples/layout/grid/GridAbstract.java |  4 ++--
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Col.java    |  2 +-
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java   |  4 ++--
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Row.java    |  2 +-
 .../applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java    |  2 +-
 .../examples/layout/grid/bootstrap3/BS3TabGroup.java         |  2 +-
 .../applib-cm/examples/layout/menubars/MenuBarsAbstract.java |  2 +-
 .../examples/layout/menubars/bootstrap3/BS3Menu.java         |  2 +-
 .../examples/layout/menubars/bootstrap3/BS3MenuBar.java      |  2 +-
 .../examples/layout/menubars/bootstrap3/BS3MenuBars.java     |  2 +-
 .../examples/layout/menubars/bootstrap3/BS3MenuSection.java  |  2 +-
 .../applib-cm/examples/mixins/dto/DtoMappingHelper.java      |  2 +-
 .../applib-cm/examples/mixins/dto/Dto_downloadXsd.java       |  2 +-
 .../applib-cm/examples/spec/AbstractSpecification2.java      |  2 +-
 .../doc/modules/applib-cm/examples/tree/LazyTreeNode.java    |  4 ++--
 .../main/doc/modules/applib-cm/examples/tree/TreeNode.java   |  2 +-
 .../src/main/doc/modules/applib-cm/examples/util/Enums.java  |  2 +-
 .../main/doc/modules/applib-cm/examples/util/Equality.java   |  4 ++--
 .../main/doc/modules/applib-cm/examples/util/Hashing.java    |  2 +-
 .../doc/modules/applib-cm/examples/util/JaxbAdapters.java    |  4 ++--
 .../main/doc/modules/applib-cm/examples/util/JaxbUtil.java   |  6 +++---
 .../applib-cm/examples/util/ObjectContract_Parser.java       |  4 ++--
 .../doc/modules/applib-cm/examples/util/ObjectContracts.java |  4 ++--
 .../doc/modules/applib-cm/examples/util/ReasonBuffer2.java   |  2 +-
 .../doc/modules/applib-cm/examples/util/TitleBuffer.java     |  2 +-
 .../main/doc/modules/applib-cm/examples/util/ToString.java   |  2 +-
 .../applib-cm/examples/util/schema/ChangesDtoUtils.java      |  2 +-
 .../applib-cm/examples/util/schema/CommandDtoUtils.java      |  2 +-
 .../applib-cm/examples/util/schema/CommonDtoUtils.java       | 12 ++++++------
 .../applib-cm/examples/util/schema/InteractionDtoUtils.java  |  6 +++---
 .../examples/util/schema/MemberExecutionDtoUtils.java        |  2 +-
 .../modules/applib-cm/examples/value/BlobClobFactory.java    |  2 +-
 .../examples/services/appfeat/ApplicationMemberType.java     |  2 +-
 .../applib-svc/examples/services/bookmark/Bookmark.java      |  4 ++--
 .../examples/services/bookmark/BookmarkService.java          |  6 +++---
 .../examples/services/confview/ConfigurationProperty.java    |  2 +-
 .../examples/services/conmap/ContentMappingService.java      |  2 +-
 .../services/exceprecog/ExceptionRecognizerAbstract.java     |  4 ++--
 .../services/exceprecog/ExceptionRecognizerComposite.java    |  2 +-
 .../services/exceprecog/ExceptionRecognizerForType.java      |  6 +++---
 .../examples/services/i18n/TranslatableString.java           |  2 +-
 .../applib-svc/examples/services/iactn/Interaction.java      |  4 ++--
 .../services/jaxb/CatalogingSchemaOutputResolver.java        |  4 ++--
 .../applib-svc/examples/services/jaxb/JaxbService.java       |  6 +++---
 .../examples/services/layout/LayoutServiceMenu.java          |  2 +-
 .../examples/services/metamodel/MetaModelService.java        |  4 ++--
 .../examples/services/metamodel/MetaModelServicesMenu.java   |  6 +++---
 .../services/queryresultscache/QueryResultsCacheDefault.java |  6 +++---
 .../examples/services/registry/ServiceRegistry.java          | 12 ++++++------
 .../applib-svc/examples/services/scratchpad/Scratchpad.java  |  2 +-
 .../examples/services/urlencoding/UrlEncodingService.java    |  4 ++--
 .../UrlEncodingServiceUsingBaseEncodingAbstract.java         |  4 ++--
 .../urlencoding/UrlEncodingServiceWithCompression.java       |  4 ++--
 .../domainmodel/DomainModelTest_usingBadDomain.java          |  2 +-
 .../DomainModelTest_usingBadDomain_noActionEnforced.java     |  2 +-
 .../domainmodel/DomainModelTest_usingGoodDomain.java         |  2 +-
 extensions/pom.xml                                           |  8 ++++++++
 incubator/pom.xml                                            |  8 ++++++++
 .../commons/internal/threadpool/ThreadPoolSupport.java       |  2 +-
 legacy/pom.xml                                               |  8 ++++++++
 .../spring/IsisMavenPlugin_SpringContextConfig.java          |  2 +-
 .../spring/IsisMavenPlugin_SpringContextLauncher.java        |  4 ++--
 mappings/pom.xml                                             |  8 ++++++++
 .../jdo/applib/fixturestate/FixturesInstalledFlag.java       |  2 +-
 .../persistence/jdo/applib/fixturestate/package-info.java    |  2 +-
 .../excel/integtests/ExcelModuleIntegTestAbstract.java       |  2 +-
 subdomains/pom.xml                                           |  8 ++++++++
 .../fakedata/integtests/FakeDataModuleIntegTestAbstract.java |  2 +-
 .../applib/IsisIntegrationTestAbstractWithFixtures.java      |  2 +-
 .../applib/fixturescripts/BuilderScriptAbstract.java         |  2 +-
 .../fixtures/applib/fixturescripts/ExecutionParameters.java  |  6 +++---
 .../fixtures/applib/fixturescripts/FixtureResultList.java    |  6 +++---
 .../fixtures/applib/fixturescripts/FixtureScript.java        | 10 +++++-----
 .../fixtures/applib/fixturescripts/FixtureScripts.java       |  4 ++--
 .../fixtures/applib/legacy/setup/PersonaEnumPersistAll.java  |  2 +-
 .../applib/legacy/teardown/TeardownFixtureAbstract.java      |  2 +-
 .../fixtures/applib/services/FixturesLifecycleService.java   |  4 ++--
 testing/pom.xml                                              |  8 ++++++++
 valuetypes/pom.xml                                           |  8 ++++++++
 .../service/swagger/internal/ClassExcluderDefault.java       |  2 +-
 .../viewer/integration/AuthenticatedWebSessionForIsis.java   |  2 +-
 91 files changed, 192 insertions(+), 136 deletions(-)

diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc b/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
index 3841770..814cace 100644
--- a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
+++ b/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
@@ -55,7 +55,7 @@ Because these are not API, they should not be used by application code, _even th
 
 To help prevent accidental usage:
 
-* the package is `org.apache.isis.commons.internal`
+* the package is `org.apache.isis.core.commons.internal`
 * all of the types in this module are prefixed "_".
 
 For example, `o.a.i.commons.internal.resources._Resource` provides utilities for loading static resources from the classpath.
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
index f01d66b..eaff20c 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
+import org.apache.isis.core.commons.internal.encoding.Encodable;
 
 /**
  * Indicates that the class should have a default, by providing a link to a
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
index 36269fa..2b4eec0 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
+import org.apache.isis.core.commons.internal.encoding.Encodable;
 
 /**
  * Indicates that the class has value semantics.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
index 5d64609..866c114 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 @XmlRootElement(name = "list")
 @XmlType(
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
index b3bfd81..55b7e38 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.annotation.Programmatic;
 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.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 
 public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
 
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
index 6668e33..06a9edb 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
index a6ecf17..e3a6731 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.events.ui;
 import java.util.Map;
 
 import org.apache.isis.applib.events.domain.EventObjectBase;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
 
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
index 40fed23..e2df05c 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
index 52a90f7..68d9d6d 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * A {@link MemberRegion region} of the page containing a set of
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
index 6c66a32..3e1d623 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.RenderDay;
 import org.apache.isis.applib.annotation.Repainting;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
index 7c6dfb7..0846eb9 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.layout.component.FieldSetOwner;
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
 import org.apache.isis.applib.services.layout.LayoutService;
-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;
 
 /**
  * All top-level page layout classes should implement this interface.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
index 141549d..91017a9 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
 import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
 import org.apache.isis.applib.layout.component.FieldSet;
 import org.apache.isis.applib.layout.component.FieldSetOwner;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
index 9db5cd2..b7a3d21 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
@@ -36,8 +36,8 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.layout.grid.GridAbstract;
 import org.apache.isis.applib.mixins.dto.Dto;
-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;
 
 /**
  * This is the top-level for rendering the domain object's properties, collections and actions.  It simply consists
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
index 77b5f70..ba2a6bd 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
index ec54b10..70e5a89 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.layout.component.ActionLayoutData;
 import org.apache.isis.applib.layout.component.CollectionLayoutData;
 import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Represents a tab within a {@link BS3TabGroup tab group}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
index 9ff4a2c..ce896d6 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Represents a tab group containing one or more {@link BS3Tab tab}s.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
index a99eb21..7bf65cf 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 import lombok.val;
 
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
index f35be92..3c7e8ce 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.layout.menubars.Menu;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 import lombok.ToString;
 
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
index c46e29f..04df142 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.layout.menubars.MenuBar;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
index d52e577..cd8341f 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
index 451805d..d3370c2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
 import org.apache.isis.applib.layout.component.ServiceActionLayoutDataOwner;
 import org.apache.isis.applib.layout.menubars.MenuSection;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 
 /**
  * Corresponds to a domain service that contributes its serviceActions under a particular {@link BS3MenuBar}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
index 81eb614..e46d79c 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
index f297601..9c72d26 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.mixins.MixinConstants;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.value.BlobClobFactory;
-import org.apache.isis.commons.compression.ZipWriter;
+import org.apache.isis.core.commons.compression.ZipWriter;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
index 110e6fc..7bd193f 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
index bf39556..673d3d1 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
 public class LazyTreeNode<T> implements TreeNode<T> {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
index 760bde1..927ad3b 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
index 2e5f185..d2d3129 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
index a8509fd..c4610ca 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
index 1a393a4..5754570 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
index b0f2f10..67a142e 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
index db7b1a3..ae8f8a1 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
index 9120f11..e8d9aab 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
index 2be0ad6..0a209c0 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
index c10f0ba..b3cd010 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
index 1219e34..edd02cc 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
index 129c52d..a11a431 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
index 7412d5f..78043f8 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
index 07373ba..820a995 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
index 4bb592d..c80b435 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
index 75d5ffa..a6fc9e2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
index 7b4d236..999af94 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/doc/modules/applib-cm/examples/value/BlobClobFactory.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
index 2930be7..1c031c2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/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/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
index c831be8..78267b8 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
index c685ba0..ec03bb3 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
index da05d27..cdb0bda 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
index 631c0ec..de0e952 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
index 9d26dfc..5a6a016 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
index 53048b3..1a2c5dc 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
index 4e0e7ed..d8ef200 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
index 7ace8f5..0cb2674 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
index 28b2d9e..8f8f1f9 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/iactn/Interaction.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
index d53e822..378c702 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
index 09a7375..820314c 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
index a6a98a3..c2d626b 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
index 7f973e8..9d2cf55 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
index b1e5778..01b9723 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
index 8b103c8..77a0ad5 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
index 61908de..869e486 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
index 43ed4a4..bdadaaf 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
index 7e33a95..79f817b 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
index 8f2749d..19be5e2 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
index 8bc0dd2..bedd2b1 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
index b7f753b..21b5d53 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/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/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 46fd00e..bb2ffee 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
 import org.apache.isis.core.metamodel.spec.DomainModelException;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index 5e9782e..0526698 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
 import org.apache.isis.core.metamodel.spec.DomainModelException;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 1b11c16..aef5013 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.isis.schema.metamodel.v1.DomainClassDto;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 573882c..be16c86 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -137,6 +137,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>security/secman</module>
 		<module>security/shiro-realm-ldap</module>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 055ffa8..df0ac17 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -81,6 +81,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>extensions/core/model</module>
 		<module>extensions/core/microprofile</module>
diff --git a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
index 53d69eb..2afa188 100644
--- a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
@@ -59,7 +59,7 @@ import lombok.extern.log4j.Log4j2;
  * Implementation Note: ThreadPoolSupport::close is triggered by _Context.clear()
  * when application shuts down.
  *
- * @deprecated in favor of the {@code org.apache.isis.commons.internal.concurrent} API
+ * @deprecated in favor of the {@code org.apache.isis.core.commons.internal.concurrent} API
  */
 @Deprecated
 @Log4j2
diff --git a/legacy/pom.xml b/legacy/pom.xml
index a1dc7ed..7fd2850 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -91,6 +91,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>extensions/core/applib</module>
 		<module>extensions/core/commons</module>
diff --git a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
index 95453a5..ca54053 100644
--- a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
+++ b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
@@ -21,7 +21,7 @@ package org.apache.isis.mavenplugin.spring;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
 import org.apache.isis.security.bypass.IsisBootSecurityBypass;
 
 /**
diff --git a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
index 492ecfd..309c185 100644
--- a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
+++ b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
@@ -35,8 +35,8 @@ import java.util.Set;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-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 lombok.extern.log4j.Log4j2;
 
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 6dc7097..4b241fb 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -85,6 +85,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>jaxrsclient/api</module>
 		<module>restclient</module>
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
index c7102f2..3bdf9fc 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
@@ -20,7 +20,7 @@
 package org.apache.isis.persistence.jdo.applib.fixturestate;
 
 /**
- * For {@link org.apache.isis.runtime.system.persistence.PersistenceSessionFactory} 
+ * For {@link org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory}
  * implementations that can cache the
  * {@link PersistenceSession#isFixturesInstalled()} so is only called once per
  * application scope.
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
index 44b134c..91b66a1 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
@@ -38,7 +38,7 @@
  *
  * <p>
  * Note that the {@link PersistenceSession} both extends a number of superinterfaces as well as uses implementations of
- * various helpers (for example {@link org.apache.isis.ServicesInjector.services.ServicesInjector} and {@link org.apache.isis.runtime.system.persistence.runtime.persistence.oidgenerator.OidGenerator}).
+ * various helpers (for example {@link org.apache.isis.ServicesInjector.services.ServicesInjector} and {@link org.apache.isis.core.runtime.system.persistence.runtime.persistence.oidgenerator.OidGenerator}).
  * These superinterfaces and helper interfaces are not normally implemented directly, and it is the
  * responsibility of the {@link PersistenceMechanismInstaller} to ensure that the correct helper objects
  * are passed to the {@link PersistenceSession} implementation.
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index cc3b797..d53c135 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -13,7 +13,7 @@ import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
 import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
 import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
 import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
 import org.apache.isis.security.bypass.IsisBootSecurityBypass;
 
 @SpringBootTest(
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index a4004b9..49ef0f9 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -143,6 +143,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 
 		<module>base</module>
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index d9784a0..a26f069 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -13,7 +13,7 @@ import org.apache.isis.config.IsisPresets;
 import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
 import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
 import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
 import org.apache.isis.security.bypass.IsisBootSecurityBypass;
 
 import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index b3520fc..7ed91c9 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -30,7 +30,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
 import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
-import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 
 public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
 
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
index 5d5f3b7..545258d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.testing.fixtures.applib.fixturescripts;
 import java.util.List;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
 import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
 import org.apache.isis.testing.fixtures.applib.api.PersonaWithFinder;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
index e0b95ca..bf9330c 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
@@ -30,9 +30,9 @@ import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.format.ISODateTimeFormat;
 
-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.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 public class ExecutionParameters {
 
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
index 3703149..3d4da3f 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
-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._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
 
 /**
  * Collecting parameter.
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 63db2a3..2d1da8b 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -45,11 +45,11 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.services.xactn.TransactionService;
-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.collections._Maps;
-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._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
 import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
 import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
 import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index b5fddf2..777a019 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -53,8 +53,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.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 org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
 import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
 import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
index d71d045..5a71c0a 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.testing.fixtures.applib.legacy.setup;
 import java.util.List;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
 import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
 import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
index 16e186c..ca2678e 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
@@ -27,7 +27,7 @@ import javax.jdo.metadata.InheritanceMetadata;
 import javax.jdo.metadata.TypeMetadata;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
 
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index 23283e2..f6aeb76 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -30,9 +30,9 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
 import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
 
 @Service
 @Named("isisTstFixtures.FixturesLifecycleService")
diff --git a/testing/pom.xml b/testing/pom.xml
index a5facdc..3c39dc9 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -125,6 +125,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>fakedata</module>
 		<module>fixtures</module>
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index 38a46f3..4a5a9d6 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -110,6 +110,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>asciidoc</module>
 		<module>markdown</module>
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index 0139757..40d30c3 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 public class ClassExcluderDefault extends ClassExcluderAbstract {
 
     public ClassExcluderDefault() {
-        ignorePackage("org.apache.isis.commons.internal");
+        ignorePackage("org.apache.isis.core.commons.internal");
     }
 
 }
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 53ba371..4c5dbad 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -117,7 +117,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, IsisWebAppComm
         //        org.apache.shiro.mgt.DefaultSecurityManager.logout(DefaultSecurityManager.java:547)
         //        org.apache.shiro.subject.support.DelegatingSubject.logout(DelegatingSubject.java:363)
         //        org.apache.isis.security.shiro.ShiroAuthenticatorOrAuthorizor.logout(ShiroAuthenticatorOrAuthorizor.java:179)
-        //        org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandard.closeSession(AuthenticationManagerStandard.java:141)
+        //        org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard.closeSession(AuthenticationManagerStandard.java:141)
 
         getAuthenticationManager().closeSession(getAuthenticationSession());
         getIsisSessionFactory().closeSession();