You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/06/27 11:49:45 UTC
[isis] branch v2 updated: ISIS-2126 aligning package names in the
'config' module
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 65bc399 ISIS-2126 aligning package names in the 'config' module
65bc399 is described below
commit 65bc39966f194138c9fdf52c82f9664d8857869b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 27 13:49:31 2019 +0200
ISIS-2126 aligning package names in the 'config' module
---
.../services/fixturespec/FixtureScriptsDefault.java | 2 +-
.../isis/applib/services/metamodel/MetaModelService.java | 2 +-
.../isis/applib/services/registry/ServiceRegistry.java | 4 ++--
.../apache/isis/{core => }/commons/collections/Bin.java | 2 +-
.../isis/{core => }/commons/collections/Bin_Empty.java | 2 +-
.../{core => }/commons/collections/Bin_Multiple.java | 2 +-
.../{core => }/commons/collections/Bin_Singleton.java | 2 +-
.../isis/{core => }/commons/collections/Cardinality.java | 2 +-
.../{core => }/commons/exceptions/IsisException.java | 2 +-
.../apache/isis/commons/internal/cdi/BeanAdapterCDI.java | 8 ++++----
.../java/org/apache/isis/commons/internal/cdi/_CDI.java | 8 ++++----
.../internal/collections/_Inbox.java} | 6 ++----
.../internal}/components/ApplicationScopedComponent.java | 2 +-
.../internal}/components/Component.java | 2 +-
.../commons => commons/internal}/components/Noop.java | 2 +-
.../internal}/components/SessionScopedComponent.java | 2 +-
.../internal}/components/TransactionScopedComponent.java | 2 +-
.../internal}/components/package-info.java | 14 +++++++-------
.../apache/isis/commons/internal/context/_Context.java | 6 +++---
.../commons/internal/context/_Context_ThreadLocal.java | 2 +-
.../apache/isis/commons/internal/context/_Plugin.java | 2 +-
.../internal}/encoding/DataInputExtended.java | 2 +-
.../internal}/encoding/DataOutputExtended.java | 2 +-
.../commons => commons/internal}/encoding/Encodable.java | 2 +-
.../isis/commons/{ => internal}/ioc/BeanAdapter.java | 4 ++--
.../apache/isis/commons/{ => internal}/ioc/BeanSort.java | 2 +-
.../commons/{ => internal}/ioc/BeanSortClassifier.java | 2 +-
.../commons/{ => internal}/ioc/LifecycleContext.java | 2 +-
.../commons/{ => internal}/ioc/PriorityConstants.java | 2 +-
.../internal}/plugins/PluginResolveException.java | 2 +-
.../plugins/beantyperegistry/BeanTypeRegistryPlugin.java | 2 +-
.../internal}/plugins/codegen/ProxyFactory.java | 2 +-
.../internal}/plugins/codegen/ProxyFactoryPlugin.java | 2 +-
.../internal}/plugins/environment/DeploymentType.java | 2 +-
.../plugins/environment/IsisSystemEnvironment.java | 2 +-
.../plugins/environment/IsisSystemEnvironmentPlugin.java | 2 +-
.../internal}/plugins/ioc/ConversationContextHandle.java | 2 +-
.../plugins/ioc/ConversationContextService.java | 2 +-
.../plugins/ioc/ConversationContextServiceDefault.java | 2 +-
.../internal}/plugins/ioc/RequestContextHandle.java | 2 +-
.../internal}/plugins/ioc/RequestContextService.java | 2 +-
.../plugins/ioc/RequestContextServiceDefault.java | 2 +-
.../isis/commons/internal/spring/BeanAdapterSpring.java | 16 ++++------------
.../org/apache/isis/commons/internal/spring/_Spring.java | 9 ++++-----
.../java/org/apache/isis/config/IsisConfiguration.java | 2 +-
.../isis/config/registry/IsisBeanTypeRegistry.java | 10 +++++-----
.../registry/IsisBeanTypeRegistry_UnitTestSupport.java | 2 +-
.../jmocking/ImposteriserTestUsingCodegenPlugin.java | 2 +-
.../components/AuthenticationManagerNull.java | 2 +-
.../java/org/apache/isis/core/webserver/WebServer.java | 2 +-
.../apache/isis/tool/mavenplugin/IsisMojoAbstract.java | 2 +-
.../commons/encoding/DataInputExtendedDecorator.java | 2 ++
.../core/commons/encoding/DataInputStreamExtended.java | 2 ++
.../commons/encoding/DataOutputExtendedDecorator.java | 2 ++
.../core/commons/encoding/DataOutputStreamExtended.java | 3 +++
.../core/commons/encoding/DebugDataInputExtended.java | 2 ++
.../core/commons/encoding/DebugDataOutputExtended.java | 2 ++
.../org/apache/isis/core/commons/encoding/FieldType.java | 3 +++
.../isis/core/commons/ensure/IsisAssertException.java | 2 +-
.../apache/isis/core/commons/ensure/package-info.java | 6 +++---
.../commons/exceptions/IsisApplicationException.java | 2 ++
.../core/commons/exceptions/UnexpectedCallException.java | 2 ++
.../core/commons/exceptions/UnknownTypeException.java | 2 ++
.../isis/core/commons/exceptions/package-info.java | 2 +-
.../commons/factory/InstanceCreationClassException.java | 2 +-
.../core/commons/factory/InstanceCreationException.java | 2 +-
.../core/commons/factory/UnavailableClassException.java | 2 +-
.../apache/isis/core/commons/lang/ArrayExtensions.java | 2 +-
.../apache/isis/core/commons/lang/ClassExtensions.java | 2 +-
.../isis/core/metamodel/ServiceRegistry_forTesting.java | 6 +++---
.../core/metamodel/adapter/ObjectAdapterProvider.java | 2 +-
.../org/apache/isis/core/metamodel/adapter/oid/Oid.java | 2 +-
.../isis/core/metamodel/adapter/oid/Oid_Parented.java | 4 ++--
.../apache/isis/core/metamodel/adapter/oid/Oid_Root.java | 4 ++--
.../isis/core/metamodel/adapter/oid/Oid_Value.java | 2 +-
.../metamodel/adapter/version/ConcurrencyException.java | 2 +-
.../isis/core/metamodel/adapter/version/Version.java | 6 +++---
.../core/metamodel/exceptions/MetaModelException.java | 2 +-
.../persistence/ObjectPersistenceException.java | 2 +-
.../isis/core/metamodel/facetapi/MetaModelRefiner.java | 2 +-
.../ActionInvocationFacetForDomainEventAbstract.java | 4 ++--
.../prototype/PrototypeFacetForActionAnnotation.java | 2 +-
.../facets/actions/prototype/PrototypeFacetAbstract.java | 2 +-
.../facets/object/facets/FacetsFacetAbstract.java | 2 +-
...PropertySetterOrClearFacetForDomainEventAbstract.java | 2 +-
.../bigdecimal/BigDecimalValueSemanticsProvider.java | 2 +-
.../booleans/BooleanValueSemanticsProviderAbstract.java | 2 +-
.../value/image/ImageValueSemanticsProviderAbstract.java | 2 +-
.../appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../services/metamodel/MetaModelServiceDefault.java | 2 +-
.../services/registry/ServiceRegistryDefault.java | 2 +-
.../registry/ServiceRegistryDefault_validate.java | 2 +-
.../isis/core/metamodel/spec/DomainModelException.java | 2 +-
.../isis/core/metamodel/spec/ObjectSpecification.java | 4 ++--
.../core/metamodel/specloader/IntrospectionMode.java | 2 +-
.../metamodel/specloader/ReflectiveActionException.java | 2 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../specloader/specimpl/ObjectSpecificationAbstract.java | 4 ++--
.../specimpl/OneToManyAssociationContributee.java | 2 +-
.../specloader/specimpl/OneToManyAssociationDefault.java | 2 +-
.../specimpl/OneToOneAssociationContributee.java | 2 +-
.../specloader/specimpl/OneToOneAssociationDefault.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../ObjectSpecificationOnStandaloneList.java | 2 +-
.../runtime/persistence/ObjectPersistenceException.java | 2 +-
.../apache/isis/core/runtime/snapshot/XmlSnapshot.java | 2 +-
.../encoding/ByteEncoderDecoderRoundtripTest.java | 3 +++
.../core/commons/encoding/EncodabilityContractTest.java | 3 ++-
.../isis/core/metamodel/adapter/version/VersionTest.java | 5 ++---
.../actions/prototype/PrototypeFacetAbstractTest.java | 3 +--
.../core/metamodel/testspec/ObjectSpecificationStub.java | 4 ++--
.../codegen/ProxyFactoryPluginUsingByteBuddy.java | 2 ++
...g.apache.isis.core.plugins.codegen.ProxyFactoryPlugin | 2 +-
.../persistence/DataNucleusApplicationComponents5.java | 2 +-
.../runtime/system/persistence/PersistenceSession5.java | 2 +-
.../system/persistence/PersistenceSessionFactory5.java | 2 +-
.../headless/HeadlessWithBootstrappingAbstract.java | 2 +-
.../org/apache/isis/core/wrapper/proxy/ProxyCreator.java | 2 +-
.../core/runtime/services/InitialisationException.java | 2 +-
.../isis/core/runtime/services/ServiceException.java | 2 +-
.../isis/core/runtime/services/ServiceInstantiator.java | 2 +-
.../services/background/BackgroundServiceDefault.java | 2 +-
.../isis/core/runtime/services/i18n/po/PoReader.java | 2 +-
.../runtime/services/i18n/po/TranslationServicePo.java | 2 +-
.../services/menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../services/persist/ObjectAdapterServiceDefault.java | 2 +-
.../runtime/services/xactn/TransactionServiceLegacy.java | 2 +-
.../isis/core/runtime/services/i18n/po/PoReaderTest.java | 2 +-
.../fixtures/FixturesInstallerFromConfiguration.java | 2 +-
.../apache/isis/core/runtime/memento/CollectionData.java | 2 +-
.../java/org/apache/isis/core/runtime/memento/Data.java | 6 +++---
.../java/org/apache/isis/core/runtime/memento/Null.java | 6 +++---
.../isis/core/runtime/memento/ObjectAdapterMemento.java | 2 +-
.../runtime/memento/ObjectAdapterMementoCollection.java | 2 +-
.../memento/ObjectAdapterMementoSupport_usingLKG.java | 2 +-
.../memento/ObjectAdapterMementoUsingSupport.java | 2 +-
.../org/apache/isis/core/runtime/memento/ObjectData.java | 6 +++---
.../apache/isis/core/runtime/memento/StandaloneData.java | 4 ++--
.../runtime/persistence/NotPersistableException.java | 2 +-
.../runtime/persistence/UnsupportedFindException.java | 2 +-
.../persistence/adapter/ObjectAdapterForBean.java | 2 +-
.../core/runtime/persistence/adapter/PojoAdapter.java | 2 +-
.../runtime/system/internal/InitialisationSession.java | 2 +-
.../runtime/system/persistence/PersistenceSession.java | 4 ++--
.../ObjectAdapterContext_DependencyInjection.java | 2 +-
.../ObjectAdapterContext_MementoSupport.java | 2 +-
.../ObjectAdapterContext_ObjectAdapterProvider.java | 2 +-
.../core/runtime/system/session/IsisSessionFactory.java | 2 +-
.../system/session/IsisSessionFactoryDefault.java | 4 ++--
.../core/runtime/system/transaction/IsisTransaction.java | 8 ++++----
.../transaction/IsisTransactionFlushException.java | 2 +-
.../transaction/IsisTransactionManagerException.java | 2 +-
.../transaction/IsisTransactionManagerJdoInternal.java | 4 ++--
.../standard/SimpleSessionEncodabilityNoRolesTest.java | 3 +--
.../standard/SimpleSessionEncodabilityWithRolesTest.java | 3 +--
.../security/authentication/AuthenticationSession.java | 2 +-
.../authentication/AuthenticationSessionAbstract.java | 4 ++--
.../authentication/health/HealthAuthSession.java | 2 +-
.../authentication/manager/AuthenticationManager.java | 2 +-
.../authentication/singleuser/SingleUserSession.java | 6 +++---
.../standard/AuthenticationManagerStandard.java | 2 +-
.../security/authentication/standard/Authenticator.java | 2 +-
.../standard/NoAuthenticatorException.java | 2 +-
.../core/security/authentication/standard/Registrar.java | 2 +-
.../security/authentication/standard/SimpleSession.java | 2 +-
.../authorization/manager/AuthorizationManager.java | 2 +-
.../core/security/authorization/standard/Authorizor.java | 2 +-
.../unittestsupport/AbstractApplyToAllContractTest.java | 2 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../core/unittestsupport/jmocking/JUnitRuleMockery2.java | 2 +-
.../integration/wicket/WebRequestCycleForIsis.java | 6 +++---
.../viewer/wicket/model/models/ActionPromptProvider.java | 3 +--
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../ui/components/scalars/ScalarPanelAbstract2.java | 2 +-
.../widgets/linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../viewer/wicket/ui/pages/login/IsisSignInPanel.java | 2 +-
.../testdomain/tests/SpringServiceProvisioningTest.java | 2 +-
178 files changed, 252 insertions(+), 240 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index 49c6042..6e37681 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -40,7 +40,7 @@ import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.collections.Bin;
/**
* Default instance of {@link FixtureScripts}, instantiated automatically by the framework if no custom user-defined instance was
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index e9de450..fe560c6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -25,7 +25,7 @@ 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._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index 29c5843..679f6cb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -27,13 +27,13 @@ import java.util.stream.Stream;
import javax.annotation.Priority;
+import org.apache.isis.commons.collections.Bin;
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.BeanAdapter;
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.commons.internal.spring._Spring;
-import org.apache.isis.commons.ioc.BeanAdapter;
-import org.apache.isis.core.commons.collections.Bin;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
similarity index 99%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin.java
rename to core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
index 0bbdb3b..110561a 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.collections;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Empty.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Empty.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Empty.java
rename to core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Empty.java
index 43800ba..6e43c72 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Empty.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Empty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.collections;
import java.util.Collections;
import java.util.Iterator;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Multiple.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Multiple.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Multiple.java
rename to core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Multiple.java
index 8984c11..c37720a 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Multiple.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Multiple.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.collections;
import java.util.Collections;
import java.util.Iterator;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Singleton.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Singleton.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Singleton.java
rename to core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Singleton.java
index a152159..938ab0a 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Bin_Singleton.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin_Singleton.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.collections;
import java.util.Collections;
import java.util.Iterator;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
rename to core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
index 2c62298..0f7eecd 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.collections;
/**
* @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java b/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
rename to core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
index bb0e1a5..819d567 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.exceptions;
+package org.apache.isis.commons.exceptions;
import java.text.MessageFormat;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/BeanAdapterCDI.java b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/BeanAdapterCDI.java
index 63ecdf0..6b5e01f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/BeanAdapterCDI.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/BeanAdapterCDI.java
@@ -20,10 +20,10 @@ package org.apache.isis.commons.internal.cdi;
import javax.enterprise.inject.spi.Bean;
-import org.apache.isis.commons.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.LifecycleContext;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.collections.Bin;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.LifecycleContext;
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
index aa7cc7d..e883832 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
@@ -38,13 +38,13 @@ import javax.enterprise.inject.spi.CDIProvider;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Qualifier;
+import org.apache.isis.commons.collections.Bin;
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.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.LifecycleContext;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.LifecycleContext;
import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Inbox.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
similarity index 92%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Inbox.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
index 1d02d7c..838f42d 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Inbox.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.collections;
+package org.apache.isis.commons.internal.collections;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
-
import lombok.val;
/**
@@ -31,7 +29,7 @@ import lombok.val;
*
* @param <T>
*/
-public class Inbox<T> implements Serializable {
+public class _Inbox<T> implements Serializable {
private static final long serialVersionUID = 1L;
private final Object $lock = new Object[0]; // serializable lock
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/ApplicationScopedComponent.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/ApplicationScopedComponent.java
index 75cbc6b..327e01f 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/ApplicationScopedComponent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.components;
+package org.apache.isis.commons.internal.components;
/**
* Indicate that the implementing component is scoped at application level
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/Component.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/Component.java
index b94d9a5..717f086 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/Component.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.components;
+package org.apache.isis.commons.internal.components;
public interface Component {
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/Noop.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/Noop.java
index fff14f5..d2ceeb0 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/Noop.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.components;
+package org.apache.isis.commons.internal.components;
/**
* Marker interface for components that are no-ops.
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/SessionScopedComponent.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/SessionScopedComponent.java
index 7b4fdc4..b457614 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/SessionScopedComponent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.components;
+package org.apache.isis.commons.internal.components;
/**
* Indicate that the implementing component is scoped at the session level (for
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/TransactionScopedComponent.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/TransactionScopedComponent.java
index 07eb770..cf87d8b 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/TransactionScopedComponent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.components;
+package org.apache.isis.commons.internal.components;
/**
* Indicate that the implementing component is scoped at the transaction level
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/components/package-info.java
similarity index 67%
rename from core/commons/src/main/java/org/apache/isis/core/commons/components/package-info.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/components/package-info.java
index dc68ccf..ae71379 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/components/package-info.java
@@ -18,25 +18,25 @@
*/
/**
- * Defines a {@link org.apache.isis.core.commons.components.Component}
+ * Defines a {@link org.apache.isis.commons.internal.components.Component}
* architecture, along with factories (called {@link org.apache.isis.core.commons.components.Installer}s)
* to install (or create) those components.
*
* <p>
* There are three subinterfaces of
- * {@link org.apache.isis.core.commons.components.Component}, for three different
+ * {@link org.apache.isis.commons.internal.components.Component}, for three different
* scopes:
* <ul>
- * <li><p> {@link org.apache.isis.core.commons.components.ApplicationScopedComponent application-scoped} </p></li>
- * <li><p> {@link org.apache.isis.core.commons.components.SessionScopedComponent session-scoped} </p></li>
- * <li><p> {@link org.apache.isis.core.commons.components.TransactionScopedComponent transaction-scoped} </p></li>
+ * <li><p> {@link org.apache.isis.commons.internal.components.ApplicationScopedComponent application-scoped} </p></li>
+ * <li><p> {@link org.apache.isis.commons.internal.components.SessionScopedComponent session-scoped} </p></li>
+ * <li><p> {@link org.apache.isis.commons.internal.components.TransactionScopedComponent transaction-scoped} </p></li>
* </ul>
*
* <p>
- * Many {@link org.apache.isis.core.commons.components.Component}s may also be injectable,
+ * Many {@link org.apache.isis.commons.internal.components.Component}s may also be injectable,
* meaning that they know hot to inject themselves to a candidate object "if appropriate".
* The convention adopted in most cases is for an object requiring injection of
* component <tt>Xxx</tt> to implement an <tt>XxxAware</tt> interface that
* defines a <tt>setXxx(Xxx)</tt> method.
*/
-package org.apache.isis.core.commons.components;
\ No newline at end of file
+package org.apache.isis.commons.internal.components;
\ No newline at end of file
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/commons/internal/context/_Context.java
index 35a76d8..f788524 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
@@ -31,11 +31,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Supplier;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.collections.Bin;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironmentPlugin;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentPlugin;
/**
* <h1>- internal use only -</h1>
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/commons/internal/context/_Context_ThreadLocal.java
index 241e7a5..a4d5680 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/commons/internal/context/_Context_ThreadLocal.java
@@ -23,10 +23,10 @@ import static org.apache.isis.commons.internal.base._With.requires;
import java.util.Map;
+import org.apache.isis.commons.collections.Bin;
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 org.apache.isis.core.commons.collections.Bin;
import lombok.Value;
import lombok.val;
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/commons/internal/context/_Plugin.java
index d7d7611..b00a899 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
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.core.plugins.PluginResolveException;
+import org.apache.isis.commons.internal.plugins.PluginResolveException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
index f762e3c..e75ed20 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
import java.io.DataInput;
import java.io.DataInputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
index 861b28a..7b7cc74 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
import java.io.DataOutput;
import java.io.DataOutputStream;
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
index 65b8227..6ffeaed 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
import java.io.IOException;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanAdapter.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanAdapter.java
similarity index 91%
rename from core/commons/src/main/java/org/apache/isis/commons/ioc/BeanAdapter.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanAdapter.java
index 7d02246..3def727 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanAdapter.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanAdapter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.ioc;
+package org.apache.isis.commons.internal.ioc;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.collections.Bin;
public interface BeanAdapter {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSort.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSort.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
index 989f54c..c91c7d6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSort.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.ioc;
+package org.apache.isis.commons.internal.ioc;
/**
* Top level object classification.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSortClassifier.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSortClassifier.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSortClassifier.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSortClassifier.java
index 2a697b7..fb21326 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/ioc/BeanSortClassifier.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSortClassifier.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.ioc;
+package org.apache.isis.commons.internal.ioc;
public interface BeanSortClassifier {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/ioc/LifecycleContext.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/LifecycleContext.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/ioc/LifecycleContext.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/ioc/LifecycleContext.java
index 19411f7..0697233 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/ioc/LifecycleContext.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/LifecycleContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.ioc;
+package org.apache.isis.commons.internal.ioc;
import org.apache.isis.commons.internal.base._Strings;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/ioc/PriorityConstants.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/commons/ioc/PriorityConstants.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
index 0b45393..912098d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/ioc/PriorityConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.commons.ioc;
+package org.apache.isis.commons.internal.ioc;
import javax.annotation.Priority;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
index d393bfc..dfd9ade 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins;
+package org.apache.isis.commons.internal.plugins;
public class PluginResolveException extends RuntimeException {
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/beantyperegistry/BeanTypeRegistryPlugin.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/beantyperegistry/BeanTypeRegistryPlugin.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/beantyperegistry/BeanTypeRegistryPlugin.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/beantyperegistry/BeanTypeRegistryPlugin.java
index e10f64c..b621e0d 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/beantyperegistry/BeanTypeRegistryPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/beantyperegistry/BeanTypeRegistryPlugin.java
@@ -1,4 +1,4 @@
-package org.apache.isis.core.plugins.beantyperegistry;
+package org.apache.isis.commons.internal.plugins.beantyperegistry;
import java.util.Set;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
index 9b0219c..5bc8b91 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.plugins.codegen;
+package org.apache.isis.commons.internal.plugins.codegen;
import java.lang.reflect.InvocationHandler;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryPlugin.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryPlugin.java
index 6bdf4fc..640636a 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.plugins.codegen;
+package org.apache.isis.commons.internal.plugins.codegen;
import javax.annotation.Nullable;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/DeploymentType.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/DeploymentType.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/environment/DeploymentType.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/DeploymentType.java
index 17266b0..8de2f9b 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/DeploymentType.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/DeploymentType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.plugins.environment;
+package org.apache.isis.commons.internal.plugins.environment;
/**
*
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
index a09c7b3..788efaf 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.plugins.environment;
+package org.apache.isis.commons.internal.plugins.environment;
import org.apache.isis.commons.internal.base._Lazy;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironmentPlugin.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentPlugin.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironmentPlugin.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentPlugin.java
index 2a9d0ad..9ab8179 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironmentPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.plugins.environment;
+package org.apache.isis.commons.internal.plugins.environment;
import org.apache.isis.commons.internal.context._Plugin;
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextHandle.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextHandle.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
index 119c157..768cf10 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextHandle.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.commons.internal.plugins.ioc;
public interface ConversationContextHandle extends AutoCloseable {
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextService.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextService.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
index 646ee68..da73e15 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextService.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.commons.internal.plugins.ioc;
public interface ConversationContextService {
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextServiceDefault.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextServiceDefault.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
index 01ab08c..1af1a55 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/ConversationContextServiceDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.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/core/plugins/ioc/RequestContextHandle.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextHandle.java
similarity index 94%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextHandle.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextHandle.java
index 0433572..0913956 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextHandle.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextHandle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.commons.internal.plugins.ioc;
public interface RequestContextHandle extends AutoCloseable {
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextService.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextService.java
similarity index 95%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextService.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextService.java
index 0587038..f529f08 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextService.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.commons.internal.plugins.ioc;
public interface RequestContextService {
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextServiceDefault.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextServiceDefault.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextServiceDefault.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextServiceDefault.java
index ddc0e5d..b4ca913 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/RequestContextServiceDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/RequestContextServiceDefault.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.plugins.ioc;
+package org.apache.isis.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/spring/BeanAdapterSpring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/BeanAdapterSpring.java
index 3142fbb..4a7b99e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/spring/BeanAdapterSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/BeanAdapterSpring.java
@@ -18,13 +18,11 @@
*/
package org.apache.isis.commons.internal.spring;
+import org.apache.isis.commons.collections.Bin;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.LifecycleContext;
import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-
-import org.apache.isis.commons.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.commons.ioc.LifecycleContext;
-import org.apache.isis.core.commons.collections.Bin;
import lombok.Value;
import lombok.val;
@@ -40,12 +38,6 @@ final class BeanAdapterSpring implements BeanAdapter {
@Override
public Bin<?> getInstance() {
-//[2112] debug
-// if(beanClass.getName().contains("MessageService")) {
-// beanProvider.stream()
-// .sorted(AnnotationAwareOrderComparator.INSTANCE)
-// .forEach(x->System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + x));
-// }
val allMatchingBeans = beanProvider.stream();
return Bin.ofStream(allMatchingBeans);
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
index 96bfb11..73bd071 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
@@ -41,17 +41,16 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
-
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.cdi._CDI;
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.exceptions._Exceptions;
-import org.apache.isis.commons.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.LifecycleContext;
-import org.apache.isis.commons.ioc.BeanSortClassifier;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSortClassifier;
+import org.apache.isis.commons.internal.ioc.LifecycleContext;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import static org.apache.isis.commons.internal.base._With.requires;
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 a24fe40..59ed802 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
@@ -27,8 +27,8 @@ import java.util.TreeMap;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
index 3c400b4..f4a396e 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
@@ -17,13 +17,13 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.SessionScopedComponent;
+import org.apache.isis.commons.internal.components.TransactionScopedComponent;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSortClassifier;
import org.apache.isis.commons.internal.spring._Spring;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.commons.ioc.BeanSortClassifier;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.components.TransactionScopedComponent;
import static org.apache.isis.commons.internal.base._With.requires;
import static org.apache.isis.commons.internal.reflection._Reflect.containsAnnotation;
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry_UnitTestSupport.java b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry_UnitTestSupport.java
index c1382bd..b5b05ee 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry_UnitTestSupport.java
+++ b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry_UnitTestSupport.java
@@ -20,7 +20,7 @@ package org.apache.isis.config.registry;
import java.util.Set;
-import org.apache.isis.core.plugins.beantyperegistry.BeanTypeRegistryPlugin;
+import org.apache.isis.commons.internal.plugins.beantyperegistry.BeanTypeRegistryPlugin;
/**
* Required workaround, to provide module 'unittestsupport' access into {@link IsisBeanTypeRegistry}
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index 5787cc5..87e2209 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin;
+import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
index c2de157..72cbeb4 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.integtestsupport.components;
-import org.apache.isis.core.commons.components.Noop;
+import org.apache.isis.commons.internal.components.Noop;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
diff --git a/core/legacy/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java b/core/legacy/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
index a2c6f3f..49475c0 100644
--- a/core/legacy/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
+++ b/core/legacy/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
@@ -26,8 +26,8 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
import org.apache.isis.applib.AppManifest;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.exceptions.IsisException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
index c06206e..6ae56ff 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import java.util.Set;
import org.apache.isis.commons.internal.base._Blackhole;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.tool.mavenplugin.spring.IsisMavenPlugin_SpringContextLauncher;
import org.apache.isis.tool.mavenplugin.util.MavenProjects;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
index fd3d8fe..8372b2c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.commons.encoding;
import java.io.DataInputStream;
import java.io.IOException;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+
public class DataInputExtendedDecorator implements DataInputExtended {
private final DataInputExtended underlying;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java
index cdad1b3..56cbceb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java
@@ -23,6 +23,8 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+
public class DataInputStreamExtended implements DataInputExtended {
private final DataInputStream dataInputStream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java
index a32fd5e..e69ff08 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.commons.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+
public class DataOutputExtendedDecorator implements DataOutputExtended {
private final DataOutputExtended underlying;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java
index dbde2ff..1a07503 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java
@@ -24,6 +24,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
+
public class DataOutputStreamExtended implements DataOutputExtended {
private final DataOutputStream dataOutputStream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
index 9ce104b..19644da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.commons.encoding;
import java.io.IOException;
import java.util.Arrays;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
index 1360861..6e9f1b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.commons.encoding;
import java.io.IOException;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
index 00dc769..4c9511a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
@@ -32,6 +32,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/IsisAssertException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/IsisAssertException.java
index ba48022..cf4894f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/IsisAssertException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/IsisAssertException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.commons.ensure;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class IsisAssertException extends IsisException {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/package-info.java
index b2a335d..72b69c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/ensure/package-info.java
@@ -18,9 +18,9 @@
*/
/**
- * Provides an infrastructure for encoding {@link org.apache.isis.core.commons.encoding.Encodable}
- * into an {@link org.apache.isis.core.commons.encoding.DataOutputExtended output stream}
- * or from an {@link org.apache.isis.core.commons.encoding.DataInputExtended input stream}.
+ * Provides an infrastructure for encoding {@link org.apache.isis.commons.internal.encoding.Encodable}
+ * into an {@link org.apache.isis.commons.internal.encoding.DataOutputExtended output stream}
+ * or from an {@link org.apache.isis.commons.internal.encoding.DataInputExtended input stream}.
*
* <p>
* This is primarily for remoting (marshalling objects across the wire) but
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
index 7e5b3c2..3b6e265 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.commons.exceptions;
+import org.apache.isis.commons.exceptions.IsisException;
+
/**
* Indicates an error raised by the application code.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
index e33bd59..f6392d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.commons.exceptions;
+import org.apache.isis.commons.exceptions.IsisException;
+
/**
* Indicates that a call was made to a method (normally an overridden one) that
* was not expected, and hence not coded for.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
index f26852e..978ccc4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.commons.exceptions;
+import org.apache.isis.commons.exceptions.IsisException;
+
public class UnknownTypeException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
index 80dca93..7d26219 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * Defines {@link org.apache.isis.core.commons.exceptions.IsisException base class}
+ * Defines {@link org.apache.isis.commons.exceptions.IsisException base class}
* for exceptions raised either by Isis itself or by the domain model
* running on top of Isis.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationClassException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationClassException.java
index 1824d1f..0988209 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationClassException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationClassException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.commons.factory;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class InstanceCreationClassException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationException.java
index ad781d1..ec819f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.commons.factory;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class InstanceCreationException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/UnavailableClassException.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/UnavailableClassException.java
index 8362549..98663a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/UnavailableClassException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/factory/UnavailableClassException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.commons.factory;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class UnavailableClassException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
index f350e1d..942f683 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
@@ -26,8 +26,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.exceptions.IsisException;
public final class ArrayExtensions {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
index 7b3089d..0803785 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/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 lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/ServiceRegistry_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/ServiceRegistry_forTesting.java
index 806d699..1b04d38 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/ServiceRegistry_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/ServiceRegistry_forTesting.java
@@ -24,16 +24,16 @@ import java.util.Set;
import java.util.stream.Stream;
import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.commons.collections.Bin;
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.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.spring._Spring;
-import org.apache.isis.commons.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.BeanSort;
import org.apache.isis.config.registry.IsisBeanTypeRegistry;
-import org.apache.isis.core.commons.collections.Bin;
import lombok.Builder;
import lombok.Value;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
index 18f09c3..5bdb670 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapterProvider.java
@@ -22,7 +22,7 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index 6a0c298..ee4bdce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
index 2f4544d..56a1948 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
@@ -24,8 +24,8 @@ import static org.apache.isis.commons.internal.base._With.requires;
import java.io.IOException;
import java.util.Objects;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.version.Version;
final class Oid_Parented implements ParentedOid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
index 57cfddc..9898212 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Root.java
@@ -25,9 +25,9 @@ import java.io.IOException;
import java.util.Objects;
import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
index a376e08..324910b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Value.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import java.io.IOException;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.OidDto;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
index c1211f7..19c64e2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.adapter.version;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class ConcurrencyException extends IsisException {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
index 96b89b2..3dde6e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
@@ -27,9 +27,9 @@ import java.util.Date;
import javax.annotation.Nullable;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.commons.lang.DateExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
index 437ec37..2f33be2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.exceptions;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.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/core/metamodel/exceptions/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
index f1a9dd2..b925627 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/persistence/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.exceptions.persistence;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.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/core/metamodel/facetapi/MetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
index 191006a..49ba774 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facetapi;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 334282e..4a9d720 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -50,10 +50,10 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.metamodel.MetaModelService.Mode;
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.ioc.BeanSort;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.MethodInvocationPreprocessor;
import org.apache.isis.core.commons.lang.ThrowableExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index dc3939e..24fdd6f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -23,10 +23,10 @@ import java.util.List;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.commons.internal.plugins.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
-import org.apache.isis.core.plugins.environment.DeploymentType;
public class PrototypeFacetForActionAnnotation extends PrototypeFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index d243ee9..22c78c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -22,11 +22,11 @@ package org.apache.isis.core.metamodel.facets.actions.prototype;
import java.util.Map;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
+import org.apache.isis.commons.internal.plugins.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.plugins.environment.DeploymentType;
public abstract class PrototypeFacetAbstract extends MarkerFacetAbstract implements PrototypeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
index d84ce6b..c738a15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 04c1564..3ede3bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.command.CommandContext;
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.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index 15e8a36..55b1ea7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/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.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index e53ab7b..53f99a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.value.booleans;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
index 43b3c40..1dd0a3b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
@@ -26,7 +26,7 @@ import java.awt.image.MemoryImageSource;
import java.awt.image.PixelGrabber;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 0a32dd7..6c621d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index b87110a..fb23f77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.metamodel.DomainModel;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 2756387..1bc4366 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -40,9 +40,9 @@ import org.apache.isis.commons.internal.base._NullSafe;
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.ioc.BeanAdapter;
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.commons.internal.spring._Spring;
-import org.apache.isis.commons.ioc.BeanAdapter;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.config.registry.IsisBeanTypeRegistry;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
index 2c05b51..9927dd9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
@@ -27,7 +27,7 @@ import java.util.stream.Stream;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Multimaps;
import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java
index f782fc0..30905dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.spec;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.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/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index f31673b..8e56666 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -28,8 +28,8 @@ import java.util.Optional;
import java.util.function.Function;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
index 059186d..5b4a30d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.metamodel.specloader;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.plugins.environment.DeploymentType;
import org.apache.isis.core.metamodel.MetaModelContext;
-import org.apache.isis.core.plugins.environment.DeploymentType;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
index 48cdbd3..075164f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.specloader;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class ReflectiveActionException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 6008eb5..1721161 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Set;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.commons.lang.MethodUtil;
import org.apache.isis.core.commons.util.ToString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index f61c7cd..4cb71d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -35,8 +35,8 @@ 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.ioc.BeanAdapter;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.config.registry.IsisBeanTypeRegistry;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 7a2af9e..b842313 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index d210881..ae4f405 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index 9035271..029f784 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index b5323dc..1d680f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -25,8 +25,8 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 12fcff4..4e22703 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.fixturescripts.FixtureScript;
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.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index 08d8ad8..bd7002a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -24,7 +24,7 @@ import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
import java.util.List;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/persistence/ObjectPersistenceException.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/persistence/ObjectPersistenceException.java
index 99f0593..acd0e66 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/persistence/ObjectPersistenceException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/persistence/ObjectPersistenceException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.persistence;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.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/core/runtime/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
index 00ed055..35cd380 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
@@ -43,8 +43,8 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot;
import org.apache.isis.applib.snapshot.SnapshottableWithInclusions;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/ByteEncoderDecoderRoundtripTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/ByteEncoderDecoderRoundtripTest.java
index 3b135ff..ad85f06 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -29,6 +29,9 @@ import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
index 82f9856..c5fb991 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
@@ -32,7 +32,8 @@ import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class EncodabilityContractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/version/VersionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/version/VersionTest.java
index b572436..59b2c98 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/version/VersionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/version/VersionTest.java
@@ -26,9 +26,8 @@ import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index d8f3b7b..408a459 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -21,10 +21,9 @@ package org.apache.isis.core.metamodel.facets.actions.prototype;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-
+import org.apache.isis.commons.internal.plugins.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.plugins.environment.DeploymentType;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.junit.Assert.assertEquals;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 004cff4..bb42704 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
diff --git a/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java b/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
index 21db918..af1d21d 100644
--- a/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
+++ b/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
@@ -29,6 +29,8 @@ 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.ProxyFactoryPlugin;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.NamingStrategy;
diff --git a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
index 25e0269..f114dd5 100644
--- a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
+++ b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
@@ -1 +1 @@
-org.apache.isis.core.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
+org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
index c1901c3..0549221 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
@@ -35,8 +35,8 @@ import org.datanucleus.metadata.MetaDataManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
index dacca47..f8d31cb 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
@@ -44,9 +44,9 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterByIdProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
index 111bdf0..de21a1e 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
@@ -27,9 +27,9 @@ import javax.jdo.PersistenceManagerFactory;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledState;
import org.apache.isis.core.runtime.persistence.FixturesInstalledStateHolder;
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
index 077a9d0..6262344 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.core.runtime.headless.logging.LeveledLogger;
import org.apache.isis.core.runtime.headless.logging.LogConfig;
import org.apache.isis.core.runtime.headless.logging.LogStream;
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
index 83a26a9..8e1bc86 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
@@ -28,9 +28,9 @@ import java.util.WeakHashMap;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.core.plugins.codegen.ProxyFactory;
import org.apache.isis.core.wrapper.handlers.DelegatingInvocationHandler;
public class ProxyCreator {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/InitialisationException.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/InitialisationException.java
index 1a2a33e..df3a66d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/InitialisationException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/InitialisationException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.services;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
/**
* Indicates a problem initialising the Apache Isis framework.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceException.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceException.java
index e30e199..7d28b89 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.services;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class ServiceException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 7f9845d..50ffc67 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -32,12 +32,12 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
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.plugins.codegen.ProxyFactory;
import org.apache.isis.core.commons.factory.InstanceCreationClassException;
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.core.plugins.codegen.ProxyFactory;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 814dfeb..74d781e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -29,13 +29,13 @@ import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.core.plugins.codegen.ProxyFactory;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
index 050281d..d1b17c1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
@@ -28,11 +28,11 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
+import org.apache.isis.commons.collections.Bin;
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.core.commons.collections.Bin;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 77fc8eb..840bd32 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -27,9 +27,9 @@ import javax.inject.Singleton;
import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.collections.Bin;
import org.apache.isis.core.runtime.system.context.IsisContext;
@Singleton
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index 11fcf66..0a1a5fa 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -46,7 +46,7 @@ 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.context._Context;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/persist/ObjectAdapterServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/persist/ObjectAdapterServiceDefault.java
index 01ccc50..875dfb8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/persist/ObjectAdapterServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/persist/ObjectAdapterServiceDefault.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Primary;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceLegacy.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceLegacy.java
index 3c845c0..b9fd0c4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceLegacy.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceLegacy.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/core/runtime/services/i18n/po/PoReaderTest.java b/core/runtime-services/src/test/java/org/apache/isis/core/runtime/services/i18n/po/PoReaderTest.java
index 6fb1880..cf1986c 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/core/runtime/services/i18n/po/PoReaderTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/core/runtime/services/i18n/po/PoReaderTest.java
@@ -30,8 +30,8 @@ import org.junit.Test;
import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.collections.Bin;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
index 4b6d41c..79c7495 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.runtime.fixtures;
import java.util.List;
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceUtil;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
index ccb8755..3f3d68e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class CollectionData extends Data {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
index e3657af..010cf5b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
@@ -22,9 +22,9 @@ package org.apache.isis.core.runtime.memento;
import java.io.IOException;
import java.io.Serializable;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java
index 9f729d5..8e9412a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java
@@ -21,9 +21,9 @@ package org.apache.isis.core.runtime.memento;
import java.io.Serializable;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
public class Null implements Encodable, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMemento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMemento.java
index b514b51..8f95dfe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMemento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMemento.java
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoCollection.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoCollection.java
index 43c9024..61cd749 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoCollection.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoCollection.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoSupport_usingLKG.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoSupport_usingLKG.java
index a72c07e..77ae81d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoSupport_usingLKG.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoSupport_usingLKG.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime.memento;
import java.util.UUID;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoUsingSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoUsingSupport.java
index 98f5187..f147409 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoUsingSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectAdapterMementoUsingSupport.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java
index 6603c6d..761ae4f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class ObjectData extends Data {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index 611039e..f7dd378 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -24,8 +24,8 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java
index 5d4f241..bc7c48b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.persistence;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class NotPersistableException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java
index b119d63..de59cc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.persistence;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class UnsupportedFindException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
index 7f74436..e48a077 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
@@ -1,6 +1,6 @@
package org.apache.isis.core.runtime.persistence.adapter;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index efb0ffa..c718791 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
import java.util.Objects;
import java.util.UUID;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
index 91a535b..07abf2a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime.system.internal;
import java.io.IOException;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index a7ad4ca..e3f7f30 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -23,10 +23,10 @@ import javax.jdo.PersistenceManager;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.commons.collections.Bin;
+import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.commons.collections.Bin;
-import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterByIdProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java
index 3d756e2..99cea48 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime.system.persistence.adaptermanager;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.system.context.session.RuntimeContext;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
index 3822fdf..d1fceca 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
@@ -24,8 +24,8 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
index afa4aa3..d585e8a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 2c950b4..de824b5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.internal.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationSession;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index b789fef..a4b0630 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -39,13 +39,13 @@ import org.apache.isis.applib.fixtures.FixtureClock;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.title.TitleService;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.ioc.BeanAdapter;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.collections.Bin;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index d4ba3fb..49ca9a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -30,9 +30,9 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.core.commons.collections.Inbox;
-import org.apache.isis.core.commons.components.TransactionScopedComponent;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.internal.collections._Inbox;
+import org.apache.isis.commons.internal.components.TransactionScopedComponent;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
@@ -163,7 +163,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
private final TransactionId id;
// private final AuthenticationSession authenticationSession;
- private final Inbox<PersistenceCommand> persistenceCommands = new Inbox<>();
+ private final _Inbox<PersistenceCommand> persistenceCommands = new _Inbox<>();
private final IsisTransactionManagerJdoInternal transactionManager;
// private final MessageBroker messageBroker;
private final PublishingServiceInternal publishingServiceInternal;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionFlushException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionFlushException.java
index f13ecdb..e18cb30 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionFlushException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionFlushException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.system.transaction;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class IsisTransactionFlushException extends IsisException {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerException.java
index d69afdc..3176da6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.system.transaction;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
public class IsisTransactionManagerException extends IsisException {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerJdoInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerJdoInternal.java
index 53eb571..6ee0e70 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerJdoInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManagerJdoInternal.java
@@ -29,8 +29,8 @@ import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index d9f70b7..32943a5 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
-
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index fce8e70..66a4ff6 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
-
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
index b3a5d1e..af578f3 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.Encodable;
/**
* The representation within the system of an authenticated user.
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
index 19d1ada..03a32fa 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
@@ -35,8 +35,8 @@ import org.apache.isis.applib.util.ToString;
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.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
index d567594..770ee07 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.security.authentication.health;
import java.io.IOException;
import java.util.stream.Stream;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 681192a..cc5c1da 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.security.authentication.manager;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationSession;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
index 3bdb73f..50dc709 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
@@ -21,9 +21,9 @@ package org.apache.isis.core.security.authentication.singleuser;
import java.io.IOException;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java
index 490c0ee..524e530 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java
@@ -30,9 +30,9 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.util.ToString;
+import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
index d61715e..7e94685 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationSession;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
index 1d47e55..01de904 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.IsisException;
/**
* Indicates that there is no Authenticator available to authenticate a user
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
index dbeb219..021ecf1 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
import java.util.function.Predicate;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
public interface Registrar extends Authenticator, ApplicationScopedComponent {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
index 839abab..9376393 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.security.authentication.standard;
import java.io.IOException;
import java.util.stream.Stream;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
index d317449..5cd9d83 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.security.authorization.manager;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
index b47c6d2..84c4b92 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.security.authorization.standard;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
public interface Authorizor extends ApplicationScopedComponent {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
index b1d3b16..dfee067 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
@@ -28,7 +28,7 @@ import javax.jdo.annotations.PersistenceCapable;
import org.junit.Test;
import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.core.plugins.beantyperegistry.BeanTypeRegistryPlugin;
+import org.apache.isis.commons.internal.plugins.beantyperegistry.BeanTypeRegistryPlugin;
import org.apache.isis.core.unittestsupport.utils.IndentPrinter;
/**
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 99b04a1..1f5203f 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -19,7 +19,7 @@ package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.isis.core.plugins.codegen.ProxyFactory;
+import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
import org.jmock.api.Imposteriser;
import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
index 66b584b..8075846 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -36,7 +36,7 @@ import org.picocontainer.MutablePicoContainer;
import org.picocontainer.PicoBuilder;
import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 28fbeeb..36d8133 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -56,12 +56,12 @@ 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.debug._Probe;
+import org.apache.isis.commons.internal.plugins.ioc.RequestContextHandle;
+import org.apache.isis.commons.internal.plugins.ioc.RequestContextService;
+import org.apache.isis.commons.internal.plugins.ioc.RequestContextServiceDefault;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.plugins.ioc.RequestContextHandle;
-import org.apache.isis.core.plugins.ioc.RequestContextService;
-import org.apache.isis.core.plugins.ioc.RequestContextServiceDefault;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisRequestCycle;
import org.apache.isis.core.runtime.system.session.IsisSession;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
index 3af2994..b88bf2e 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
@@ -17,8 +17,7 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.commons.ioc.BeanSort;
-
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 262c5d3..ff8375b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -36,9 +36,9 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.collections.Bin;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 71da68f..5dc4bc3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index 2655494..3fbfa46 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 9bdbb86..0cb5ad4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.ioc.BeanSort;
+import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.config.property.ConfigPropertyEnum;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 21d394a..4abdb9c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.core.commons.collections.Bin;
+import org.apache.isis.commons.collections.Bin;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/example/misc/smoketest/src/test/java/org/apache/isis/testdomain/tests/SpringServiceProvisioningTest.java b/example/misc/smoketest/src/test/java/org/apache/isis/testdomain/tests/SpringServiceProvisioningTest.java
index 0e4018e..18830b5 100644
--- a/example/misc/smoketest/src/test/java/org/apache/isis/testdomain/tests/SpringServiceProvisioningTest.java
+++ b/example/misc/smoketest/src/test/java/org/apache/isis/testdomain/tests/SpringServiceProvisioningTest.java
@@ -27,9 +27,9 @@ import java.nio.charset.StandardCharsets;
import java.util.TreeSet;
import java.util.stream.Collectors;
+import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.commons.internal.resources._Json;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.commons.ioc.BeanAdapter;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.jdo.transaction.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.runtime.spring.IsisBoot;